From 1fdf6e20532487a64ce3b1a762a4a575b9d3f8e3 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 11 Nov 2016 14:55:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8A=A8=E6=80=81=E4=B8=AD?=
 =?UTF-8?q?=E4=B8=80=E4=BA=9B=E7=94=A8=E6=88=B7=E7=9A=84url=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=99=BB=E5=BD=95=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_project_issue.html.erb           | 6 +++---
 app/views/users/_project_message.html.erb         | 4 ++--
 app/views/users/_user_blog.html.erb               | 8 ++++----
 app/views/users/_user_journalsformessage.html.erb | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb
index 8a860723e..e2cf4540c 100644
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@@ -2,15 +2,15 @@
     <div class="resources mt10" id="user_activity_<%= user_activity_id%>">
       <div class="homepagePostBrief">
         <div class="homepagePostPortrait">
-          <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
+          <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author), :alt => "用户头像" %>
           <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
         </div>
         <div class="homepagePostDes">
           <div class="homepagePostTo break_word" style="width:620px">
             <% if activity.try(:author).try(:realname) == ' ' %>
-                <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
+                <%= link_to activity.try(:author), user_path(activity.author), :class => "newsBlue mr15" %>
             <% else %>
-                <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
+                <%= link_to activity.try(:author).try(:realname), user_path(activity.author), :class => "newsBlue mr15" %>
             <% end %>  TO
             <%=  link_to activity.project.name.to_s+" | 项目问题", project_issues_path(activity.project), :class => "newsBlue ml15"%>
           </div>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index e3e16605e..e57de6b6f 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -1,12 +1,12 @@
 <div class="resources mt10" id="user_activity_<%= user_activity_id%>">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author), :alt => "用户头像" %>
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word"  style="width:620px">
-        <%= link_to activity.author.show_name, user_path(activity.author_id), :class => "newsBlue mr15" %>
+        <%= link_to activity.author.show_name, user_path(activity.author), :class => "newsBlue mr15" %>
         TO
         <%= link_to activity.project.name.to_s+" | 项目讨论区",project_boards_path(activity.project), :class => "newsBlue ml15 mr5"%>
         <!--<a href="javascript:void(0);" class="newsBlue ml15 mr5"><%= activity.project.name %>(项目讨论区)</a>-->
diff --git a/app/views/users/_user_blog.html.erb b/app/views/users/_user_blog.html.erb
index d2eb57b83..5b11d5436 100644
--- a/app/views/users/_user_blog.html.erb
+++ b/app/views/users/_user_blog.html.erb
@@ -1,18 +1,18 @@
 <div class="resources mt10" id="user_activity_<%= user_activity_id%>">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author), :alt => "用户头像" %>
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word">
-        <%= link_to activity.author.show_name, user_path(activity.author_id), :class => "newsBlue mr15" %>
+        <%= link_to activity.author.show_name, user_path(activity.author), :class => "newsBlue mr15" %>
          TO  <!--+"(课程名称)"-->
-        <%= link_to activity.author.name.to_s+" | 博客", user_blogs_path(:user_id=>activity.author_id), :class => "newsBlue ml15" %>
+        <%= link_to activity.author.name.to_s+" | 博客", user_blogs_path(:user_id=>activity.author), :class => "newsBlue ml15" %>
       </div>
       <div class="homepagePostTitle break_word"> <!--+"(通知标题)"-->
         <div class="fl">
-        <%= link_to activity.title.to_s, user_blog_blog_comment_path(:user_id=>activity.author_id,:blog_id=>activity.blog_id,:id=>activity.id,:in_act => true), :class => "postGrey" %>
+        <%= link_to activity.title.to_s, user_blog_blog_comment_path(:user_id => activity.author_id,:blog_id=>activity.blog_id,:id=>activity.id,:in_act => true), :class => "postGrey" %>
           <% if activity.locked%>
               <span class="locked_btn_cir ml10" title="已锁定">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
           <% end%>
diff --git a/app/views/users/_user_journalsformessage.html.erb b/app/views/users/_user_journalsformessage.html.erb
index 67fbbf494..a84ec8218 100644
--- a/app/views/users/_user_journalsformessage.html.erb
+++ b/app/views/users/_user_journalsformessage.html.erb
@@ -1,12 +1,12 @@
 <div class="resources mt10" id="user_activity_<%= user_activity_id%>" style="<%= activity.private == 1? 'background-color:#cecece;':'' %>">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50"), user_path(activity.user_id), :alt => "用户头像" %>
+      <%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50"), user_path(activity.user), :alt => "用户头像" %>
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.user} %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word">
-        <%= link_to activity.user.show_name, user_path(activity.user_id), :class => "newsBlue mr15" %>
+        <%= link_to activity.user.show_name, user_path(activity.user), :class => "newsBlue mr15" %>
         TO
         <% if activity.jour %>
             <%= link_to activity.jour.show_name+"（"+(activity.jour.login ? activity.jour.login : activity.jour.show_name ).to_s+"）的"+ (activity.private == 1? "私信":"留言"),