Improved _sortBy().
This commit is contained in:
parent
014d761bf8
commit
eea8d684fc
1 changed files with 20 additions and 6 deletions
|
@ -248,18 +248,32 @@ class App.Model extends Spine.Model
|
||||||
if params.order
|
if params.order
|
||||||
all_complied = @_order( all_complied, params.order )
|
all_complied = @_order( all_complied, params.order )
|
||||||
|
|
||||||
return all_complied
|
all_complied
|
||||||
|
|
||||||
@_sortBy: ( collection, attribute ) ->
|
@_sortBy: ( collection, attribute ) ->
|
||||||
_.sortBy( collection, (item) ->
|
_.sortBy( collection, (item) ->
|
||||||
return '' if item[ attribute ] is undefined || item[ attribute ] is null
|
|
||||||
return item[ attribute ].toLowerCase()
|
# set displayName as default sort attribute
|
||||||
|
if !attribute
|
||||||
|
attribute = 'displayName'
|
||||||
|
|
||||||
|
# check if displayName exists
|
||||||
|
if attribute is 'displayName' && item.displayName
|
||||||
|
return item.displayName().toLowerCase()
|
||||||
|
else
|
||||||
|
attribute = 'name'
|
||||||
|
|
||||||
|
return '' if item[ attribute ] is undefined
|
||||||
|
return '' if item[ attribute ] is null
|
||||||
|
|
||||||
|
# return value
|
||||||
|
item[ attribute ].toLowerCase()
|
||||||
)
|
)
|
||||||
|
|
||||||
@_order: ( collection, attribute ) ->
|
@_order: ( collection, attribute ) ->
|
||||||
if attribute is 'DESC'
|
if attribute is 'DESC'
|
||||||
return collection.reverse()
|
return collection.reverse()
|
||||||
return collection
|
collection
|
||||||
|
|
||||||
@_filter: ( collection, filter ) ->
|
@_filter: ( collection, filter ) ->
|
||||||
for key, value of filter
|
for key, value of filter
|
||||||
|
@ -267,7 +281,7 @@ class App.Model extends Spine.Model
|
||||||
if item[ key ] is value
|
if item[ key ] is value
|
||||||
return item
|
return item
|
||||||
)
|
)
|
||||||
return collection
|
collection
|
||||||
|
|
||||||
@_filterExtended: ( collection, filters ) ->
|
@_filterExtended: ( collection, filters ) ->
|
||||||
collection = _.filter( collection, (item) ->
|
collection = _.filter( collection, (item) ->
|
||||||
|
@ -292,6 +306,6 @@ class App.Model extends Spine.Model
|
||||||
|
|
||||||
return
|
return
|
||||||
)
|
)
|
||||||
return collection
|
collection
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue