From 2f6b6d62b16c700f135a101da48b2c5a95dc4873 Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Wed, 9 Dec 2015 15:26:55 +0800
Subject: [PATCH] sort fixes

---
 app/models/honor.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/models/honor.rb b/app/models/honor.rb
index 10c0d57..a8ff799 100644
--- a/app/models/honor.rb
+++ b/app/models/honor.rb
@@ -53,7 +53,7 @@ class Honor
       }
     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|
@@ -68,11 +68,12 @@ class Honor
 
       {
         "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
-    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