@ -125,45 +125,33 @@ class UsersController < ApplicationController
@message_alls << message_all . message
end
end
# when 'system_messages'
# @message_alls = SystemMessage.order("created_at desc").all
when 'apply'
@message_alls = ForgeMessage . where ( " forge_message_type in ('ProjectInvite', 'AppliedProject') and user_id =? " , @user ) . order ( " created_at desc " )
#课程相关消息
when 'homework'
@message_alls = CourseMessage . where ( " course_message_type in ('HomeworkCommon','StudentWorksScore','JournalsForMessage') and user_id =? " , @user ) . order ( " created_at desc " )
when 'course_message'
@message_alls = CourseMessage . where ( " course_message_type =? and user_id =? " , " Message " , @user ) . order ( " created_at desc " )
when 'forge_message'
@message_alls = ForgeMessage . where ( " forge_message_type =? and user_id =? " , " Message " , @user ) . order ( " created_at desc " )
# @message_alls_count = @message_alls.count
when 'course_news'
# 课程通知包含发布的通知和回复的通知
@message_alls = CourseMessage . where ( " course_message_type =? or course_message_type =? " , " News " , " Comment " ) . where ( " user_id =? " , @user ) . order ( " created_at desc " )
#@user_course_messages_count = @user_course_messages.count
# when 'forge_news'
# @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "News", @user).order("created_at desc")
# @message_alls_count = @message_alls.count
# when 'course_news_reply'
# @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Comment", @user).order("created_at desc")
# when 'forge_news_reply'
# @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Comment", @user).order("created_at desc")
# @message_alls_count = @message_alls.count
# when 'poll'
# @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Poll", @user).order("created_at desc")
# @message_alls_count = @message_alls.count
# when 'works_reviewers'
# @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "StudentWorksScore", @user).order("created_at desc")
# @message_alls_count = @message_alls.count
# when 'works_reply'
# @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "JournalsForMessage", @user).order("created_at desc")
# @message_alls_count = @message_alls.count
when 'poll'
@message_alls = CourseMessage . where ( " course_message_type =? and user_id =? " , " Poll " , @user ) . order ( " created_at desc " )
#项目相关消息
when 'issue'
@message_alls = ForgeMessage . where ( " forge_message_type =? or forge_message_type =? " , " Issue " , " Journal " ) . where ( " user_id=? " , @user ) . order ( " created_at desc " )
# when 'issue_update' # 缺陷状态更新、留言
# @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Journal", @user).order("created_at desc")
# @message_alls_count = @message_alls.count
when 'forge_message'
@message_alls = ForgeMessage . where ( " forge_message_type =? and user_id =? " , " Message " , @user ) . order ( " created_at desc " )
when 'forge_news'
@message_alls = ForgeMessage . where ( " forge_message_type in (?,?) and user_id =? " , " News " , " Comment " , @user ) . order ( " created_at desc " )
when 'apply'
@message_alls = ForgeMessage . where ( " forge_message_type in ('ProjectInvite', 'AppliedProject') and user_id =? " , @user ) . order ( " created_at desc " )
#贴吧消息
when 'forum'
@message_alls = MemoMessage . where ( " memo_type =? and user_id =? " , " Memo " , @user ) . order ( " created_at desc " )
#用户留言
when 'user_feedback'
@message_alls = UserFeedbackMessage . where ( " journals_for_message_type =? and user_id =? " , " JournalsForMessage " , @user ) . order ( " created_at desc " )
else
