From 1b9da8d963fb41fa06a909b8b3d2179c56546e4b Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 27 Aug 2015 16:57:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=B7=BB=E5=8A=A0=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 1 + app/views/users/user_messages.html.erb | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index a8243c5a5..f8eeb289a 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -176,6 +176,7 @@ class UsersController < ApplicationController render_404 return end + @message_alls = paginateHelper @message_alls,15 respond_to do |format| format.html{render :layout=>'new_base_user'} end diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 97a159884..549355c29 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -86,14 +86,14 @@
  • <%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %>
  • <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue" %>
    • <% if ma.course_message.parent_id.nil? %> -
  • ">发布了帖子
    • +
  • ">发布了课程帖子
  • <%=link_to ma.course_message.subject.html_safe, course_boards_path(ma.course_message.course,:parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id),:class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}", :title => "#{ma.course_message.subject.html_safe}" %>
  • <%= time_tag(ma.course_message.created_on).html_safe %>
    • <% else %> -
  • ">回复了帖子
    • +
  • ">评论了课程帖子
  • <%=link_to ma.course_message.subject.html_safe, course_boards_path(ma.course_message.course,:parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id),:class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}", @@ -165,7 +165,7 @@
  • <%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %>
  • <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue" %>
    • -
  • "><%= ma.forge_message.parent_id.nil? ? "发布了帖子" : "回复了帖子" %>
    • +
  • "><%= ma.forge_message.parent_id.nil? ? "发布了项目帖子" : "评论了项目帖子" %>
  • <%=link_to ma.forge_message.subject.html_safe, project_boards_path(ma.forge_message.project, :parent_id => ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id, @@ -193,7 +193,7 @@