diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 23106c954..220781ed9 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -148,6 +148,8 @@ class UsersController < ApplicationController
@message_alls << message_all.message
end
end
+ when 'system_message'
+ @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/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index e36fd4f32..b5473edee 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -6,6 +6,8 @@
<%= link_to "全部",user_message_path(User.current), :class => "resourcesGrey" %>
<%= link_to "未读消息", user_message_path(User.current, :type => 'unviewed'), :class => "resourcesGrey" %>
<%= link_to "用户申请", user_message_path(User.current, :type => 'apply'), :class => "resourcesGrey" %>
+ <%# 系统消息 %>
+ <%= link_to "系统消息", user_message_path(User.current, :type => 'system_message'), :class => "resourcesGrey" %>
<%# 课程相关消息 %>
<%= link_to "作业消息", user_message_path(User.current, :type => 'homework'), :class => "resourcesGrey" %>
<%= link_to "课程讨论",user_message_path(User.current, :type => 'course_message'), :class => "resourcesGrey" %>
@@ -42,8 +44,14 @@
<%# 系统消息 %>
<% @user_system_messages.each do |usm| %>
- - ddddddddddddddd
- - Trustiep平台发布新消息:
+ -
+
+
+ <%=image_tag("/images/logo.png",width:"30px", height: "30px",class: "mt3") %>
+
+
+
+ - Trustie平台发布新消息:
-
<%= link_to usm.content, {:controller => 'system_messages', :action => 'index'},
:class =>"newsGrey",
@@ -303,6 +311,23 @@
<% end %>
<% end %>
+ <% if ma.class == SystemMessage %>
+
+ -
+
+
+ <%=image_tag("/images/logo.png",width:"30px", height: "30px",class: "mt3")%>
+
+
+
+ - Trustie平台发布新消息:
+ -
+ <%= link_to ma.content, {:controller => 'system_messages', :action => 'index'},
+ :class =>"newsGrey",
+ :title => "#{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%>