erictyl
/
personal-honor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sort fixes

This commit is contained in:
Harry Bomrah 2015-12-09 15:26:55 +08:00
parent af05f4dbf0
commit 2f6b6d62b1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/models/honor.rb
View File

@ -53,7 +53,7 @@ class Honor
} }
end end
plugin_datas = datas.sort_for_frontend.collect do |p| plugin_datas = datas.sort_for_frontend.collect.with_index do |p,index|
pd_data = [] pd_data = []
fields_to_show.collect do |t| fields_to_show.collect do |t|
@ -68,11 +68,12 @@ class Honor
{ {
"pd_datas" => pd_data, "pd_datas" => pd_data,
"type-sort" => (p.honor_type.sort_position rescue 1000) "type-sort" => (p.honor_type.sort_position.to_i rescue 1000),
"sort-index" => index
} }
end end
plugin_datas = plugin_datas.sort{|k,v| k["type-sort"] <=> v["type-sort"]} plugin_datas = plugin_datas.sort_by{|pd| [pd["type-sort"], pd["sort-index"]]}
return [pd_title,plugin_datas] return [pd_title,plugin_datas]
end end