diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 1579a23c4..bee68c419 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -98,11 +98,12 @@ class UsersController < ApplicationController # 用户消息 def user_messages - @user_messges = @user.forge_messages - respond_to do |format| - format.html{render :layout=>'base_users_new'} - format.api - end + @user_course_messages = @user.course_messages + @user_project_messges = @user.forge_messages + respond_to do |format| + format.html{render :layout=>'base_users_new'} + format.api + end end def user_projects_index diff --git a/app/models/user.rb b/app/models/user.rb index 3cd248c8a..bb9a6d0a1 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -129,6 +129,7 @@ class User < Principal has_many :documents # 项目中关联的文档再次与人关联 # 关联虚拟表 has_many :forge_messages + has_many :course_messages # end # 虚拟转换 diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index e7fcb790a..1891a5a99 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -1,75 +1,52 @@
-
-
-
-
消息
- -
- +
+
+
+
消息
+ +
-
- - - - - - - - +
+ <% @user_course_messages.each do |ucm| %> + <% if ucm.course_message_type == "News" %> + + <% end %> + <% if ucm.course_message_type == "HomeworkCommon" %> + + <% end %> + <% if ucm.course_message_type == "Poll" %> + + <% end %> + <% end %> +
-