From d23e266f5865cadf5d470b296537180115cb0727 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 6 Mar 2019 21:30:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/managements_controller.rb    | 6 +++---
 app/views/layouts/_logined_header.html.erb   | 4 ++--
 app/views/managements/update_notice.html.erb | 6 ++++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb
index f7c37d97..b43e70df 100644
--- a/app/controllers/managements_controller.rb
+++ b/app/controllers/managements_controller.rb
@@ -3120,12 +3120,12 @@ end
   def update_notice
     @menu_type = 12
     @sub_type = 8
-    @notice = SystemUpdateNotice.first
+    @notice = SystemUpdateNotice.last
   end
 
   def edit_update_notice
-    notice = SystemUpdateNotice.first
-    if notice.present?
+    notice = SystemUpdateNotice.last
+    if notice.present? && notice.end_time > Time.now
       notice.update_attributes(:end_time => params[:end_time], :start_time => params[:start_time], :subject => params[:subject], :notes => params[:notes])
     else
       notice_type = UserSystemNotice.find_by_sql("select max(notice_type) as max_notice_type from user_system_notices").first.try(:max_notice_type).to_i + 1
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 0b7bb769..f48b5615 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -122,8 +122,8 @@
           var htmlvalue = "<%= escape_javascript(render :partial => 'account/user_update_notice', :locals => {:notice => notice})%>";
           pop_box_new(htmlvalue, 500, 380);
           <% UserSystemNotice.create(:user_id => User.current.id, :notice_type => notice.notice_type) %>
-        <% elsif notice.present? && notice.end_time < Time.now %>
-          <% notice.destroy %>
+        <%# elsif notice.present? && notice.end_time < Time.now %>
+          <%# notice.destroy %>
         <% end %>
     });
 
diff --git a/app/views/managements/update_notice.html.erb b/app/views/managements/update_notice.html.erb
index 5f31d389..0cabe548 100644
--- a/app/views/managements/update_notice.html.erb
+++ b/app/views/managements/update_notice.html.erb
@@ -38,7 +38,8 @@
             format:'Y-m-d H:i',
             formatTime:'H:i',
             formatDate:'Y-m-d',
-            validateOnBlur:false
+            validateOnBlur:false,
+            step:30
         });
         $('#notice_end_time').datetimepicker({
             allowBlank:true,
@@ -46,7 +47,8 @@
             format:'Y-m-d H:i',
             formatTime:'H:i',
             formatDate:'Y-m-d',
-            validateOnBlur:false
+            validateOnBlur:false,
+            step:30
         });
     });