From 02ace5693fa9dd27f10a7785e75944d56c9f09a0 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 3 Sep 2015 16:02:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=A4=9A=E4=BD=99=E7=9A=84=E6=A8=AA=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_course_message.html.erb | 2 +- app/views/users/_course_news.html.erb | 2 +- app/views/users/_project_issue.html.erb | 2 +- app/views/users/_project_message.html.erb | 2 +- app/views/users/show.html.erb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb index cbd7a916b..3cbcd33dd 100644 --- a/app/views/users/_course_message.html.erb +++ b/app/views/users/_course_message.html.erb @@ -85,7 +85,7 @@ <% activity= activity.parent ? activity.parent : activity%> <% replies_all_i = 0 %> <% if count > 0 %> -
+
    <% activity.children.reorder("created_on desc").each do |reply|%> <% replies_all_i=replies_all_i+1 %> diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb index a558911c1..3d2ee18b4 100644 --- a/app/views/users/_course_news.html.erb +++ b/app/views/users/_course_news.html.erb @@ -57,7 +57,7 @@ <% replies_all_i = 0 %> <% if count > 0 %> -
    +
      <% activity.comments.reorder("created_on desc").each do |comment| %> <% replies_all_i = replies_all_i + 1 %> diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb index 1bd0b834a..011ac5c70 100644 --- a/app/views/users/_project_issue.html.erb +++ b/app/views/users/_project_issue.html.erb @@ -94,7 +94,7 @@ <% replies_all_i = 0 %> <% if count > 0 %> -
      +
        <% activity.journals.reorder("created_on desc").each do |reply| %> <% replies_all_i=replies_all_i + 1 %> diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb index 6c3842f73..18bc49f23 100644 --- a/app/views/users/_project_message.html.erb +++ b/app/views/users/_project_message.html.erb @@ -71,7 +71,7 @@ <% activity= activity.parent_id.nil? ? activity : activity.parent %> <% replies_all_i = 0 %> <% if count > 0 %> -
        +
          <% activity.children.reorder("created_on desc").each do |reply| %> <% replies_all_i=replies_all_i+1 %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index c1cd3723f..92f3f4a1a 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -37,4 +37,4 @@
        -<%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities,:page => 0,:type => @type} %> +<%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities,:page => 0,:type => @type} %> From bf2e63b7be39e2842b665ef1c32aee830b92af71 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 3 Sep 2015 16:09:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E2=80=9C=E6=9C=AA=E8=AF=BB=E2=80=9D=E5=92=8C?= =?UTF-8?q?=E5=B7=B2=E8=AF=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 24 ++++++++++++------------ app/views/users/user_messages.html.erb | 6 +----- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 5bd124fb9..5a249c346 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -106,18 +106,18 @@ class UsersController < ApplicationController return end # 当前用户查看消息，则设置消息为已读 - if params[:viewed] == "all" - course_querys = @user.course_messages - forge_querys = @user.forge_messages - user_querys = @user.user_feedback_messages - forum_querys = @user.memo_messages - if User.current.id == @user.id - course_querys.update_all(:viewed => true) - forge_querys.update_all(:viewed => true) - user_querys.update_all(:viewed => true) - forum_querys.update_all(:viewed => true) - end - end + #if params[:viewed] == "all" + # course_querys = @user.course_messages + # forge_querys = @user.forge_messages + # user_querys = @user.user_feedback_messages + # forum_querys = @user.memo_messages + # if User.current.id == @user.id + # course_querys.update_all(:viewed => true) + # forge_querys.update_all(:viewed => true) + # user_querys.update_all(:viewed => true) + # forum_querys.update_all(:viewed => true) + # end + #end # @new_message_count = forge_querys.count + forum_querys.count + course_querys.count + user_querys.count case params[:type] when nil diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index b2f852264..1d288b4b8 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -29,11 +29,7 @@
        -<% if params[:type].nil? %> -
        - 有 <%= User.current.count_new_message %> 条未读<%= link_to "全部设为已读", user_message_path(User.current, :viewed => 'all') %> -
        -<% end %> + <% if @message_alls.count >0 %> <%# 课程消息 %> <% unless @message_alls.nil? %>