Merge branch 'master' into production

This commit is contained in:
phoenixeliot 2016-07-18 10:47:10 -07:00
commit 316e0d7144

View file

@ -68,5 +68,4 @@ module.exports = class SchoolLicensesView extends RootView
@schools.sort (a, b) -> @schools.sort (a, b) ->
b.activity - a.activity or new Date(a.endDate).getTime() - new Date(b.endDate).getTime() or b.max - a.max or b.used - a.used or b.prepaids.length - a.prepaids.length or b.name.localeCompare(a.name) b.activity - a.activity or new Date(a.endDate).getTime() - new Date(b.endDate).getTime() or b.max - a.max or b.used - a.used or b.prepaids.length - a.prepaids.length or b.name.localeCompare(a.name)
# console.log @schools
@render() @render()