From 9e87e63b8219696758afa8c7153831df3ac75a39 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 4 Jan 2016 10:36:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=B6=88=E6=81=AF=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E9=99=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/system_messages_controller.rb |  2 +-
 app/views/admin/messages.html.erb             |  8 --------
 app/views/users/user_system_messages.html.erb | 11 -----------
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/app/controllers/system_messages_controller.rb b/app/controllers/system_messages_controller.rb
index 6e9c8ad13..df17ca3e2 100644
--- a/app/controllers/system_messages_controller.rb
+++ b/app/controllers/system_messages_controller.rb
@@ -42,7 +42,7 @@ class SystemMessagesController < ApplicationController
     @system_messages.description = params[:system_message][:description]
     @system_messages.subject = params[:system_message][:subject]
     @system_messages.user_id = User.current.id
-    @system_messages.save_attachments(params[:attachments])
+    # @system_messages.save_attachments(params[:attachments])
     respond_to do |format|
       if @system_messages.save
         format.html {redirect_to user_system_messages_path(User.current)}
diff --git a/app/views/admin/messages.html.erb b/app/views/admin/messages.html.erb
index 5a8d9e0d2..040dd0fe8 100644
--- a/app/views/admin/messages.html.erb
+++ b/app/views/admin/messages.html.erb
@@ -19,15 +19,7 @@
       <div>
         <p id="content_notice_span" class="ml55"></p>
       </div>
-
-        <div class="mt10">
-          <div class="fl" id="topic_attachments">
-            <%= render :partial => 'attachments/form', :locals => {:container => @admin_messages} %>
-          </div>
-        </div>
-
       <div class="cl"></div>
-
       <div class="actions">
         <%= link_to l(:label_submit), "javascript:void(0)", :class => "btn_message_free", :onclick => "system_message_editor.sync();submit_message();" %>
       </div>
diff --git a/app/views/users/user_system_messages.html.erb b/app/views/users/user_system_messages.html.erb
index f80bc70ab..66d7037e9 100644
--- a/app/views/users/user_system_messages.html.erb
+++ b/app/views/users/user_system_messages.html.erb
@@ -18,17 +18,6 @@
             </p>
           </div>
           <div class="cl"></div>
-          <% if  system_message.attachments.any? %>
-              <div class=" fl" style="width: 600px">
-                <% if system_message.attachments.any?%>
-                    <%# options = {:author => true, :deletable => @memo.deleted_attach_able_by?(User.current) } %>
-                    <%= link_to_attachment_project system_message, :thumbnails => false %>
-                    <%#= link_to_attachments_course system_message, :author => false %>
-                <% end %>
-              </div>
-
-          <% end %>
-          <div class="cl"></div>
           <p class="homepagePostDeadline">发布时间：<%= format_time(system_message.created_at) %></p>
         </div>
         <div class="cl"></div>