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"%>

<%=l(:label_system_message)%>


diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 54a2854e9..23afdd245 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -25,7 +25,7 @@ <%# 系统贴吧 %>
  • <%= link_to "用户留言",user_message_path(User.current, :type => 'user_feedback'), :class => "resourcesGrey" %>
  • <%# 系统消息 %> -
  • <%= link_to "系统消息", user_message_path(User.current, :type => 'system_messages'), :class => "resourcesGrey" %>
  • +
  • <%= link_to "系统消息", user_system_messages_path(User.current), :class => "resourcesGrey" %>
  • @@ -54,7 +54,7 @@ 【系统消息】
  • - <%= 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 %> - - <% end %> <% end %>