diff --git a/app/models/project.rb b/app/models/project.rb index c7dfc90..16047d8 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -58,7 +58,7 @@ class Project } end - plugin_datas = datas.sort_for_frontend.collect do |p| + plugin_datas = datas.sort_for_frontend.collect.with_index do |p,index| pd_data = [] fields_to_show.collect do |t| @@ -82,11 +82,12 @@ class Project { "pd_datas" => pd_data, - "type-sort" => (p.project_type.sort_position rescue 1000) + "type-sort" => (p.project_type.sort_position.to_i rescue 1000), + "sort-index" => index } 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] end