Make sure that workers are correctly sorted
This commit is contained in:
parent
aef185f536
commit
e997ac7f6a
|
@ -11,14 +11,38 @@ Travis.reopen
|
||||||
|
|
||||||
WorkersController: Em.ArrayController.extend
|
WorkersController: Em.ArrayController.extend
|
||||||
groups: (->
|
groups: (->
|
||||||
if content = @get 'content'
|
if content = @get 'arrangedContent'
|
||||||
groups = {}
|
groups = {}
|
||||||
for worker in content.toArray()
|
for worker in content.toArray()
|
||||||
host = worker.get('host')
|
host = worker.get('host')
|
||||||
groups[host] = Em.ArrayProxy.create(content: []) unless groups[host]
|
groups[host] = Em.ArrayProxy.create(content: []) unless groups[host]
|
||||||
groups[host].pushObject(worker)
|
groups[host].pushObject(worker)
|
||||||
|
|
||||||
|
prepareForSort = (str) ->
|
||||||
|
match = str.match /(.*?)-(\d+)/
|
||||||
|
name = match[1]
|
||||||
|
id = match[2].toString()
|
||||||
|
if id.length < 2
|
||||||
|
id = "00#{id}"
|
||||||
|
else if id.length < 3
|
||||||
|
id = "0#{id}"
|
||||||
|
|
||||||
|
"#{name}-#{id}"
|
||||||
|
|
||||||
|
for own host, workers of groups
|
||||||
|
groups[host] = workers.toArray().sort (a, b) ->
|
||||||
|
a = prepareForSort a.get('name')
|
||||||
|
b = prepareForSort b.get('name')
|
||||||
|
|
||||||
|
if a < b
|
||||||
|
-1
|
||||||
|
else if b < a
|
||||||
|
1
|
||||||
|
else
|
||||||
|
0
|
||||||
|
|
||||||
$.values(groups)
|
$.values(groups)
|
||||||
).property('content.length')
|
).property('length')
|
||||||
|
|
||||||
SponsorsController: Em.ArrayController.extend
|
SponsorsController: Em.ArrayController.extend
|
||||||
page: 0
|
page: 0
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -1 +1 @@
|
||||||
22486b52
|
13b44fe6
|
Loading…
Reference in New Issue
Block a user