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

---
 app/models/journal_paper.rb                   | 2 ++
 app/views/admin/journal_papers/_form.html.erb | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/models/journal_paper.rb b/app/models/journal_paper.rb
index acf7ed3..74cd7be 100644
--- a/app/models/journal_paper.rb
+++ b/app/models/journal_paper.rb
@@ -48,6 +48,8 @@ class JournalPaper
   before_validation :add_http
   # validates :paper_title, presence: true
 
+  scope :sort_for_frontend, ->{ where(:is_hidden=>false).order_by(:year => "desc", :publication_date => "desc") }
+
   def create_link
     title = []
 
diff --git a/app/views/admin/journal_papers/_form.html.erb b/app/views/admin/journal_papers/_form.html.erb
index 8677de1..9beca17 100644
--- a/app/views/admin/journal_papers/_form.html.erb
+++ b/app/views/admin/journal_papers/_form.html.erb
@@ -248,7 +248,7 @@
       <div class="control-group">
         <label class="control-label muted"><%= t("personal_journal.publication_date") %></label>
         <div class="controls">
-         <%= f.datetime_picker :publication_date, :no_label => true, :format=>"yyyy/MM/dd", :placeholder=>"YYYY/MM/DD" %>
+         <%= f.datetime_picker :publication_date, :no_label => true, :format=>"yyyy/MM/dd", :placeholder=>"YYYY/MM/DD", :value => @journal_paper.publication_date, :new_record => @journal_paper.new_record? %>
         </div>
       </div>