diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 686ffbb89..f6ff5fd5d 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -147,7 +147,7 @@ class UsersController < ApplicationController when 'issue' @user_forge_messages = ForgeMessage.where("forge_message_type =? and user_id =?", "Issue", @user).order("created_at desc") @user_forge_messages_count = @user_forge_messages.count - when 'journal' # 缺陷状态更新、留言 + when 'issue_update' # 缺陷状态更新、留言 @user_forge_messages = ForgeMessage.where("forge_message_type =? and user_id =?", "Forum", @user).order("created_at desc") @user_forge_messages_count = @user_forge_messages.count when 'forum' diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index c9de406bf..fcc2d36e7 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -211,11 +211,11 @@ <%= image_tag(url_to_avatar(urm.memo.author), :width => "30", :height => "30") %>
  • - "><%= urm.memo.author %> + <%= urm.memo.author %>
  • -
  • ">回复了贴吧帖子
  • +
  • 回复了贴吧帖子
  • - <%= link_to urm.memo.subject, forum_memo_path(urm.memo.forum_id, urm.memo.parent_id ? urm.memo.parent_id: urm.memo.id),:class => "#{urm.viewed == 0 ? "newsBlack" : "newsGrey"}" %> + <%= link_to urm.memo.subject, forum_memo_path(urm.memo.forum_id, urm.memo.parent_id ? urm.memo.parent_id: urm.memo.id),:class => "newsGrey" %>
  • <%= time_tag(urm.memo.created_at).html_safe %>
  • @@ -231,18 +231,18 @@ <%= image_tag(url_to_avatar(ufm.journals_for_message.user), :width => "30", :height => "30") %>
  • - "><%= ufm.journals_for_message.user %> + <%= ufm.journals_for_message.user %>
  • <% if ufm.journals_for_message.reply_id == 0 %> -
  • ">给你留言了
  • +
  • 给你留言了
  • - <%= link_to ufm.journals_for_message.notes, feedback_path(ufm.journals_for_message.jour_id),:class => "#{ufm.viewed == 0 ? "newsBlack" : "newsGrey"}" %> + <%= link_to ufm.journals_for_message.notes, feedback_path(ufm.journals_for_message.jour_id), :class => "newsGrey" %>
  • <% else %> -
  • ">回复了你的留言
  • +
  • 回复了你的留言
  • - <%= link_to ufm.journals_for_message.notes, feedback_path(ufm.journals_for_message.parent.user_id),:class => "#{ufm.viewed == 0 ? "newsBlack" : "newsGrey"}" %> + <%= link_to ufm.journals_for_message.notes, feedback_path(ufm.journals_for_message.parent.user_id),:class => "newsGrey" %>
  • <% end %>
  • <%= time_tag(ufm.journals_for_message.created_on).html_safe %>