harrybomrah
/
personal-experience
forked from saurabh/personal-experience
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sort fix

This commit is contained in:
Harry Bomrah 2015-12-08 19:08:29 +08:00
parent c70bafc599
commit 49ec846c38
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/experience.rb
View File

@ -54,7 +54,7 @@ class Experience
"plugin_data_title" => I18n.t("personal_experience.#{t}") "plugin_data_title" => I18n.t("personal_experience.#{t}")
} }
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|
@ -77,11 +77,12 @@ class Experience
{ {
"pd_datas" => pd_data, "pd_datas" => pd_data,
"type-sort" => (p.experience_type.sort_position rescue 1000) "type-sort" => (p.experience_type.sort_position rescue 1000),
"sort-index" => index.to_s
} }
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