diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 497ceae2b..0d08cf08a 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -143,8 +143,8 @@ class UsersController < ApplicationController
@message_alls << message_all.message
end
end
- when 'system_messages'
- @message_alls = SystemMessage.order("created_at desc").all
+ # when 'system_messages'
+ # @message_alls = SystemMessage.order("created_at desc").all
when 'apply'
@message_alls = ForgeMessage.where("forge_message_type =? and user_id =?" , "AppliedProject", @user).order("created_at desc")
when 'homework'
diff --git a/app/views/admin/messages.html.erb b/app/views/admin/messages.html.erb
index 2e1e29b30..f87741dd9 100644
--- a/app/views/admin/messages.html.erb
+++ b/app/views/admin/messages.html.erb
@@ -1,5 +1,4 @@
<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %>
-<%= stylesheet_link_tag "project","public"%>
- <%= link_to usm.content.nil? ? usm.description.html_safe : usm.content.html_safe, user_message_path(User.current, :type => "system_messages"),
+ <%= link_to usm.content.nil? ? usm.description.html_safe : usm.content.html_safe, user_system_messages_path(User.current),
:id => "content_link_#{usm.id}",
:onmouseover =>"message_titile_show($(this),event);",
:onmouseout => "message_titile_hide($(this));"
@@ -432,46 +432,6 @@
<% end %>
<% end %>
- <%# 系统消息 %>
- <% if ma.class == SystemMessage %>
-
- -
-
-
- <%=image_tag("/images/logo.png",width:"30px", height: "30px",class: "mt3")%>
-
-
-
- - Trustie平台发布新消息:
- 【系统消息】-
- <%= link_to ma.content.nil? ? ma.description.html_safe : ma.content.html_safe, user_message_path(User.current, :type => "system_messages"),
- :id => "content_link_#{ma.id}",
- :onmouseover =>"message_titile_show($(this),event);",
- :onmouseout => "message_titile_hide($(this));"
- %>
-
-
-
- [展开]
-
-
-
- <%= ma.content.nil? ? ma.description.html_safe : ma.content.html_safe %>
-
- - <%= time_tag(ma.created_at).html_safe %>
-
- <% end %>
<% end %>
<%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>