Merge branch 'master' into production

This commit is contained in:
phoenixeliot 2016-06-14 14:29:19 -07:00
commit 53aa6652a0

View file

@ -42,7 +42,7 @@ module.exports = class CoursesView extends RootView
@listenToOnce @courseInstances, 'sync', @onCourseInstancesLoaded @listenToOnce @courseInstances, 'sync', @onCourseInstancesLoaded
@supermodel.loadCollection(@courseInstances) @supermodel.loadCollection(@courseInstances)
@classrooms = new CocoCollection([], { url: "/db/classroom", model: Classroom }) @classrooms = new CocoCollection([], { url: "/db/classroom", model: Classroom })
@supermodel.loadCollection(@classrooms, { data: {memberID: me.id} }) @supermodel.loadCollection(@classrooms, { data: {memberID: me.id}, cache: false })
@ownedClassrooms = new Classrooms() @ownedClassrooms = new Classrooms()
@ownedClassrooms.fetchMine({data: {project: '_id'}}) @ownedClassrooms.fetchMine({data: {project: '_id'}})
@supermodel.trackCollection(@ownedClassrooms) @supermodel.trackCollection(@ownedClassrooms)