From 77581d46ebd8c0a98c29ba4cf4455cac4c830aed Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 9 Oct 2015 15:50:40 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=B0=86=E6=89=80=E6=9C=89=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=9A=84=E6=B6=88=E6=81=AF=E9=83=BD=E5=88=97=E5=87=BA=E6=9D=A5?= =?UTF-8?q?=EF=BC=9B=202.=E4=BF=AE=E5=A4=8D=E5=BD=93=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=97=B6=EF=BC=8C=E6=B5=8F=E8=A7=88=E5=99=A8?= =?UTF-8?q?=E7=AB=AF=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 44 ++++++++++---------------- app/views/users/user_messages.html.erb | 14 +++----- 2 files changed, 20 insertions(+), 38 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 7e44174fe..045f2b4e7 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -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 diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 813c13509..25900e737 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -12,26 +12,20 @@
  • <%= link_to "作业消息", user_message_path(User.current, :type => 'homework'), :class => "resourcesGrey" %>
  • <%= link_to "课程讨论",user_message_path(User.current, :type => 'course_message'), :class => "resourcesGrey" %>
  • <%= link_to "课程通知",user_message_path(User.current, :type => 'course_news'), :class => "resourcesGrey" %>
    • - - - - +
  • <%= link_to "课程问卷", user_message_path(User.current, :type => 'poll'), :class => "resourcesGrey" %>
    • @@ -40,7 +34,7 @@
    - <% if @message_alls.count >0 || @user_system_messages.count >0 %> + <% if (!@message_alls.nil? && @message_alls.count >0) || (!@user_system_messages.nil? && @user_system_messages.count >0) %> <% if params[:type].nil? || params[:type] == "unviewed" %>
    有 <%= unviewed_message(@user) %> 条未读