Merge branch 'bug-smash' of https://github.com/codecombat/codecombat into bug-smash

This commit is contained in:
Josh Callebaut 2016-05-31 11:24:06 -07:00
commit 50df5cc33f

View file

@ -127,7 +127,6 @@ module.exports = class TeacherClassView extends RootView
@render() @render()
# Model/Collection events # Model/Collection events
@listenTo @classroom, 'sync change update', -> @listenTo @classroom, 'sync change update', ->
@removeDeletedStudents()
classCode = @classroom.get('codeCamel') or @classroom.get('code') classCode = @classroom.get('codeCamel') or @classroom.get('code')
@state.set { @state.set {
classCode: classCode classCode: classCode
@ -144,7 +143,6 @@ module.exports = class TeacherClassView extends RootView
@listenTo @students, 'sync change update add remove reset', -> @listenTo @students, 'sync change update add remove reset', ->
# Set state/props of things that depend on students? # Set state/props of things that depend on students?
# Set specific parts of state based on the models, rather than just dumping the collection there? # Set specific parts of state based on the models, rather than just dumping the collection there?
@removeDeletedStudents()
@calculateProgressAndLevels() @calculateProgressAndLevels()
classStats = @calculateClassStats() classStats = @calculateClassStats()
@state.set classStats: classStats if classStats @state.set classStats: classStats if classStats