From 419330309388434b47709c21530146a10ad00974 Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Wed, 2 Dec 2015 18:35:40 +0800
Subject: [PATCH] sort and date fixed

---
 app/models/research.rb                   | 4 +++-
 app/views/admin/researchs/_form.html.erb | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/models/research.rb b/app/models/research.rb
index bc49717..0a72f9a 100644
--- a/app/models/research.rb
+++ b/app/models/research.rb
@@ -28,6 +28,8 @@ class Research
 
   before_validation :add_http
 
+  scope :sort_for_frontend, ->{ where(:is_hidden=>false).order_by(:year => "desc", :publish_date => "desc") }
+
   def get_plugin_data(fields_to_show)
     plugin_datas = []
     fields_to_show.each do |field|
@@ -53,7 +55,7 @@ class Research
       }
     end
 
-    plugin_datas = datas.where(:is_hidden=>false).order_by(:year=>'desc').collect do |p|
+    plugin_datas = datas.sort_for_frontend.collect do |p|
 
       pd_data = []
       fields_to_show.collect do |t|
diff --git a/app/views/admin/researchs/_form.html.erb b/app/views/admin/researchs/_form.html.erb
index 1482054..ad2febb 100644
--- a/app/views/admin/researchs/_form.html.erb
+++ b/app/views/admin/researchs/_form.html.erb
@@ -163,7 +163,7 @@
       <div class="control-group big-group">
         <label class="control-label muted"><%= t("personal_research.publication_date") %></label>
         <div class="controls">
-          <%= f.datetime_picker :publish_date, :no_label => true, :format=>"yyyy/MM" %>
+          <%= f.datetime_picker :publish_date, :no_label => true, :format=>"yyyy/MM", :value => @research.publish_date, :new_record => @research.new_record? %>
         </div>
       </div>