From 4442d286ce301a3fa1b02160133a83a6ea1613e5 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 8 Mar 2016 15:20:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=B8=8B=E7=9A=84=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E8=BF=9E=E6=8E=A5=E6=94=B9=E6=88=90https://www.?=
 =?UTF-8?q?=E2=80=A6=E2=80=A6=E5=BD=A2=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb              | 10 ++++++++++
 .../organizations/_org_activities.html.erb     |  2 +-
 .../organizations/_org_course_create.html.erb  |  6 +++---
 .../_org_course_homework.html.erb              | 12 ++++++------
 .../organizations/_org_course_message.html.erb | 14 +++++++-------
 .../organizations/_org_course_news.html.erb    | 14 +++++++-------
 .../organizations/_org_course_poll.html.erb    |  6 +++---
 .../organizations/_org_project_issue.html.erb  | 18 +++++++++---------
 .../_org_subfield_message.html.erb             | 14 +++++++-------
 .../organizations/_org_subfield_news.html.erb  | 14 +++++++-------
 .../organizations/_project_create.html.erb     |  6 +++---
 .../organizations/_project_message.html.erb    | 14 +++++++-------
 .../organizations/_show_org_document.html.erb  | 10 +++++-----
 app/views/users/_show_detail_info.html.erb     |  2 +-
 14 files changed, 76 insertions(+), 66 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index bf7a5fdf9..71e19375f 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2895,3 +2895,13 @@ int main(int argc, char** argv){
     end
   end
 end
+
+def user_url_in_org(user_id)
+  if Rails.env.development?
+    return "http://localhost:3000/users/" + user_id.to_s
+  elsif Rails.env.test?
+    return "https://www.test.forge.net/users/" + user_id.to_s
+  else
+    return "https://www.trustie.net/users/" + user_id.to_s
+  end
+end
diff --git a/app/views/organizations/_org_activities.html.erb b/app/views/organizations/_org_activities.html.erb
index 20b98ffa0..c5ec9cd4a 100644
--- a/app/views/organizations/_org_activities.html.erb
+++ b/app/views/organizations/_org_activities.html.erb
@@ -50,7 +50,7 @@
                       <%= render :partial => 'users/show_detail_info', :locals => {:user => User.find(act.user_id)} %>
                     </div>
                     <div class="homepagePostDes">
-                      <div class="homepagePostTo"><%= link_to User.find(act.user_id), user_path(act.user_id) %>&nbsp;&nbsp;创建了 <a href="<%= organization_path(@organization)%>" class="newsBlue ml10"><%= Organization.find(act.org_act_id).name %>
+                      <div class="homepagePostTo"><%= link_to User.find(act.user_id), user_url_in_org(act.user_id) %>&nbsp;&nbsp;创建了 <a href="<%= organization_path(@organization)%>" class="newsBlue ml10"><%= Organization.find(act.org_act_id).name %>
                         | 组织</a></div>
                       <div class="homepagePostDate"> 创建时间：<%= format_activity_day(act.created_at) %> <%= format_time(act.created_at, false) %> </div>
                     </div>
diff --git a/app/views/organizations/_org_course_create.html.erb b/app/views/organizations/_org_course_create.html.erb
index dc1e0ee81..3e22f33e1 100644
--- a/app/views/organizations/_org_course_create.html.erb
+++ b/app/views/organizations/_org_course_create.html.erb
@@ -1,15 +1,15 @@
 <div class="resources mt10">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(activity.teacher), :width => "50", :height => "50"), user_path(activity.tea_id), :alt => "用户头像" %>
+      <%= link_to image_tag(url_to_avatar(activity.teacher), :width => "50", :height => "50"), user_url_in_org(activity.tea_id), :alt => "用户头像" %>
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.teacher} %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word mt-4">
         <% if activity.try(:teacher).try(:realname) == ' ' %>
-            <%= link_to activity.try(:teacher), user_path(activity.tea_id), :class => "newsBlue mr15" %>
+            <%= link_to activity.try(:teacher), user_url_in_org(activity.tea_id), :class => "newsBlue mr15" %>
         <% else %>
-            <%= link_to activity.try(:teacher).try(:realname), user_path(activity.tea_id), :class => "newsBlue mr15" %>
+            <%= link_to activity.try(:teacher).try(:realname), user_url_in_org(activity.tea_id), :class => "newsBlue mr15" %>
         <% end %>
         TO
         <%= link_to activity.name.to_s+" | 课程", course_path(activity.id,:host=>Setting.host_course), :class => "newsBlue ml15" %>
diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb
index 0e056c972..0dd9fb725 100644
--- a/app/views/organizations/_org_course_homework.html.erb
+++ b/app/views/organizations/_org_course_homework.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.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_url_in_org(activity.user_id), :alt => "用户头像" %>
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.user} %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word mt-4">
         <% if activity.try(:user).try(:realname) == ' ' %>
-            <%= link_to activity.try(:user), user_path(activity.user_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
+            <%= link_to activity.try(:user), user_url_in_org(activity.user_id), :class => "newsBlue mr15" %>
         <% else %>
-            <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
+            <%= link_to activity.try(:user).try(:realname), user_url_in_org(activity.user_id), :class => "newsBlue mr15" %>
         <% end %> TO <!--+"(课程名称)" -->
         <%= link_to activity.course.name.to_s+" | 课程作业", homework_common_index_path(:course => activity.course.id, :host=> Setting.host_course), :class => "newsBlue ml15"%>
       </div>
@@ -303,14 +303,14 @@
                 <% replies_all_i = replies_all_i + 1 %>
                 <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i > 3 ? 'none' : '' %>">
                   <div class="homepagePostReplyPortrait">
-                    <%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33", :class =>"mt8"), user_path(comment.user_id), :alt => "用户头像" %>
+                    <%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33", :class =>"mt8"), user_url_in_org(comment.user_id), :alt => "用户头像" %>
                   </div>
                   <div class="homepagePostReplyDes">
                     <div class="homepagePostReplyPublisher">
                       <% if comment.try(:user).try(:realname) == ' ' %>
-                          <%= link_to comment.try(:user), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
+                          <%= link_to comment.try(:user), user_url_in_org(comment.user_id), :class => "newsBlue mr10 f14" %>
                       <% else %>
-                          <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
+                          <%= link_to comment.try(:user).try(:realname), user_url_in_org(comment.user_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
                       <%= format_time(comment.created_on) %>
                       <span id="reply_praise_count_<%=comment.id %>">
diff --git a/app/views/organizations/_org_course_message.html.erb b/app/views/organizations/_org_course_message.html.erb
index 7eee53d02..99229634e 100644
--- a/app/views/organizations/_org_course_message.html.erb
+++ b/app/views/organizations/_org_course_message.html.erb
@@ -1,15 +1,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,:host=>Setting.host_user), :alt => "用户头像" %>
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_url_in_org(activity.author_id), :alt => "用户头像" %>
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word mt-4">
         <% if activity.try(:author).try(:realname) == ' ' %>
-            <%= link_to activity.try(:author), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
+            <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
         <% else %>
-            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
+            <%= link_to activity.try(:author).try(:realname), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
         <% end %>
         TO
         <%= link_to activity.course.name.to_s+" | 课程问答区", course_boards_path(activity.course,:host=> Setting.host_course), :class => "newsBlue ml15 mr5"%>
@@ -105,14 +105,14 @@
                 <% replies_all_i=replies_all_i+1 %>
                 <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>3 ? 'none' : '' %>">
                   <div class="homepagePostReplyPortrait">
-                    <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_path(reply.author_id,:host=>Setting.host_user), :alt => "用户头像" %>
+                    <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_url_in_org(reply.author_id), :alt => "用户头像" %>
                   </div>
                   <div class="homepagePostReplyDes">
                     <div class="homepagePostReplyPublisher mt-4">
                       <% if reply.try(:author).try(:realname) == ' ' %>
-                          <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
+                          <%= link_to reply.try(:author), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %>
                       <% else %>
-                          <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
+                          <%= link_to reply.try(:author).try(:realname), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
                       <%= format_time(reply.created_on) %>
                       <span id="reply_praise_count_<%=reply.id %>">
@@ -136,7 +136,7 @@
 
     <% if !activity.locked? && authorize_for_course('messages', 'reply') %>
         <div class="homepagePostReplyContainer borderBottomNone minHeight48">
-          <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
+          <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_url_in_org(activity.author_id), :alt => "用户头像" %></div>
           <div class="homepagePostReplyInputContainer  mb10">
             <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
               <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
diff --git a/app/views/organizations/_org_course_news.html.erb b/app/views/organizations/_org_course_news.html.erb
index 665f5c1ae..ecdf728f8 100644
--- a/app/views/organizations/_org_course_news.html.erb
+++ b/app/views/organizations/_org_course_news.html.erb
@@ -1,15 +1,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_url_in_org(activity.author_id), :alt => "用户头像" %>
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word mt-4">
         <% if @ctivity.try(:author).try(:realname) == ' ' %>
-            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
+            <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :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_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
         <% end %> TO  <!--+"(课程名称)"-->
         <%= link_to activity.course.name.to_s+" | 课程通知", course_news_index_path(activity.course), :class => "newsBlue ml15" %>
       </div>
@@ -74,14 +74,14 @@
                 <% replies_all_i = replies_all_i + 1 %>
                 <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i > 3 ? 'none' : '' %>">
                   <div class="homepagePostReplyPortrait">
-                    <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_path(comment.author_id), :alt => "用户头像" %>
+                    <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_url_in_org(comment.author_id), :alt => "用户头像" %>
                   </div>
                   <div class="homepagePostReplyDes">
                     <div class="homepagePostReplyPublisher mt-4">
                       <% if comment.try(:author).try(:realname) == ' ' %>
-                          <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
+                          <%= link_to comment.try(:author), user_url_in_org(comment.author_id), :class => "newsBlue mr10 f14" %>
                       <% else %>
-                          <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
+                          <%= link_to comment.try(:author).try(:realname), user_url_in_org(comment.author_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
                       <%= format_time(comment.created_on) %>
                       <span id="reply_praise_count_<%=comment.id %>">
@@ -103,7 +103,7 @@
     <% end %>
 
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
-      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_url_in_org(activity.author_id), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
         <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
           <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
diff --git a/app/views/organizations/_org_course_poll.html.erb b/app/views/organizations/_org_course_poll.html.erb
index 7e09e2215..c124e829f 100644
--- a/app/views/organizations/_org_course_poll.html.erb
+++ b/app/views/organizations/_org_course_poll.html.erb
@@ -5,15 +5,15 @@
       <div class="homepagePostBrief">
         <div class="homepagePostPortrait">
           <!-- <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a>-->
-          <%= 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_url_in_org(activity.user_id), :alt => "用户头像" %>
           <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.user} %>
         </div>
         <div class="homepagePostDes">
           <div class="homepagePostTo break_word mt-4">
             <% if activity.try(:user).try(:realname) == ' ' %>
-                <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %>
+                <%= link_to activity.try(:user), user_url_in_org(activity.user_id), :class => "newsBlue mr15" %>
             <% else %>
-                <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id), :class => "newsBlue mr15" %>
+                <%= link_to activity.try(:user).try(:realname), user_url_in_org(activity.user_id), :class => "newsBlue mr15" %>
             <% end %>
             TO
             <%= link_to Course.find(activity.polls_group_id).name.to_s+" | 问卷", poll_index_path(:polls_type => "Course", :polls_group_id => activity.polls_group_id), :class => "newsBlue ml15" %>
diff --git a/app/views/organizations/_org_project_issue.html.erb b/app/views/organizations/_org_project_issue.html.erb
index 2495e0044..855a8053c 100644
--- a/app/views/organizations/_org_project_issue.html.erb
+++ b/app/views/organizations/_org_project_issue.html.erb
@@ -1,15 +1,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_url_in_org(activity.author_id), :alt => "用户头像" %>
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word mt-4">
         <% 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_url_in_org(activity.author_id), :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_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
         <% end %>  TO
         <%=  link_to activity.project.name.to_s+" | 项目问题", project_issues_path(activity.project), :class => "newsBlue ml15"%>
       </div>
@@ -23,9 +23,9 @@
         <div class="homepagePostAssignTo">指派给&nbsp;&nbsp;
           <% unless activity.assigned_to_id.nil? %>
               <% if activity.try(:assigned_to).try(:realname) == ' ' %>
-                  <%= link_to activity.try(:assigned_to), user_path(activity.assigned_to_id), :class => "newsBlue mr15" %>
+                  <%= link_to activity.try(:assigned_to), user_url_in_org(activity.assigned_to_id), :class => "newsBlue mr15" %>
               <% else %>
-                  <%= link_to activity.try(:assigned_to).try(:realname), user_path(activity.assigned_to_id), :class => "newsBlue mr15" %>
+                  <%= link_to activity.try(:assigned_to).try(:realname), user_url_in_org(activity.assigned_to_id), :class => "newsBlue mr15" %>
               <% end %>
           <% end %>
         </div>
@@ -85,14 +85,14 @@
                 <% replies_all_i=replies_all_i + 1 %>
                 <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>3 ? 'none' : '' %>">
                   <div class="homepagePostReplyPortrait">
-                    <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_path(reply.user_id), :alt => "用户头像" %>
+                    <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_url_in_org(reply.user_id), :alt => "用户头像" %>
                   </div>
                   <div class="homepagePostReplyDes">
                     <div class="homepagePostReplyPublisher mt-4">
                       <% if reply.try(:user).try(:realname) == ' ' %>
-                          <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
+                          <%= link_to reply.try(:user), user_url_in_org(reply.user_id), :class => "newsBlue mr10 f14" %>
                       <% else %>
-                          <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
+                          <%= link_to reply.try(:user).try(:realname), user_url_in_org(reply.user_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
                       <%= format_time(reply.created_on) %>
                       <span id="reply_praise_count_<%=reply.id %>">
@@ -120,7 +120,7 @@
     <% end %>
 
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
-      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_url_in_org(activity.author_id), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
         <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
           <%= form_for('new_form',:url =>  add_journal_in_org_issue_path(activity.id),:method => "post", :remote => true) do |f|%>
diff --git a/app/views/organizations/_org_subfield_message.html.erb b/app/views/organizations/_org_subfield_message.html.erb
index 55f03a367..aa2493c5f 100644
--- a/app/views/organizations/_org_subfield_message.html.erb
+++ b/app/views/organizations/_org_subfield_message.html.erb
@@ -1,15 +1,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_url_in_org(activity.author_id), :alt => "用户头像" %>
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word mt-4">
         <% 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_url_in_org(activity.author_id), :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_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
         <% end %>
         TO
         <%= link_to activity.board.org_subfield.name.to_s+" | 帖子栏目讨论区",organization_path(activity.board.org_subfield.organization, :org_subfield_id => activity.board.org_subfield.id), :class => "newsBlue ml15 mr5"%>
@@ -110,14 +110,14 @@
                 <% replies_all_i=replies_all_i+1 %>
                 <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>3 ? 'none' : '' %>">
                   <div class="homepagePostReplyPortrait">
-                    <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_path(reply.author_id), :alt => "用户头像" %>
+                    <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_url_in_org(reply.author_id), :alt => "用户头像" %>
                   </div>
                   <div class="homepagePostReplyDes">
                     <div class="homepagePostReplyPublisher mt-4">
                       <% if reply.try(:author).try(:realname) == ' ' %>
-                          <%= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
+                          <%= link_to reply.try(:author), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %>
                       <% else %>
-                          <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
+                          <%= link_to reply.try(:author).try(:realname), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
                       <%= format_time(reply.created_on) %>
                       <span id="reply_praise_count_<%=reply.id %>">
@@ -139,7 +139,7 @@
     <% end %>
 
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
-      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_url_in_org(activity.author_id), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
         <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
           <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
diff --git a/app/views/organizations/_org_subfield_news.html.erb b/app/views/organizations/_org_subfield_news.html.erb
index 891ad14a7..edbdfa16b 100644
--- a/app/views/organizations/_org_subfield_news.html.erb
+++ b/app/views/organizations/_org_subfield_news.html.erb
@@ -1,15 +1,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_url_in_org(activity.author_id), :alt => "用户头像" %>
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word mt-4">
         <% 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_url_in_org(activity.author_id), :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_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
         <% end %> TO  <!--+"(课程名称)"-->
         <%= link_to activity.org_subfield.name.to_s+" | 帖子栏目通知", organization_path(activity.org_subfield.organization, :org_subfield_id => activity.org_subfield.id), :class => "newsBlue ml15" %>
       </div>
@@ -94,14 +94,14 @@
                 <% replies_all_i = replies_all_i + 1 %>
                 <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i > 3 ? 'none' : '' %>">
                   <div class="homepagePostReplyPortrait">
-                    <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_path(comment.author_id), :alt => "用户头像" %>
+                    <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_url_in_org(comment.author_id), :alt => "用户头像" %>
                   </div>
                   <div class="homepagePostReplyDes">
                     <div class="homepagePostReplyPublisher mt-4">
                       <% if comment.try(:author).try(:realname) == ' ' %>
-                          <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
+                          <%= link_to comment.try(:author), user_url_in_org(comment.author_id), :class => "newsBlue mr10 f14" %>
                       <% else %>
-                          <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
+                          <%= link_to comment.try(:author).try(:realname), user_url_in_org(comment.author_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
                       <%= format_time(comment.created_on) %>
                       <span id="reply_praise_count_<%=comment.id %>">
@@ -123,7 +123,7 @@
     <% end %>
 
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
-      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_url_in_org(activity.author_id), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
         <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
           <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
diff --git a/app/views/organizations/_project_create.html.erb b/app/views/organizations/_project_create.html.erb
index b68b7ceeb..e13f4128b 100644
--- a/app/views/organizations/_project_create.html.erb
+++ b/app/views/organizations/_project_create.html.erb
@@ -3,15 +3,15 @@
 <div class="resources mt10">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(user), :width => "50", :height => "50"), user_path(user), :alt => "用户头像" %>
+      <%= link_to image_tag(url_to_avatar(user), :width => "50", :height => "50"), user_url_in_org(user), :alt => "用户头像" %>
       <%= render :partial => 'users/show_detail_info', :locals => {:user => user} %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word mt-4">
         <% if user.try(:realname) == ' ' %>
-            <%= link_to user, user_path(user), :class => "newsBlue mr15" %>
+            <%= link_to user, user_url_in_org(user), :class => "newsBlue mr15" %>
         <% else %>
-            <%= link_to user.try(:realname), user_path(user), :class => "newsBlue mr15" %>
+            <%= link_to user.try(:realname), user_url_in_org(user), :class => "newsBlue mr15" %>
         <% end %>
         TO
         <%= link_to project.to_s+" | 项目", project_path(project.id,:host=>Setting.host_course), :class => "newsBlue ml15" %>
diff --git a/app/views/organizations/_project_message.html.erb b/app/views/organizations/_project_message.html.erb
index 6cc3f5740..3b459f366 100644
--- a/app/views/organizations/_project_message.html.erb
+++ b/app/views/organizations/_project_message.html.erb
@@ -1,15 +1,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_url_in_org(activity.author_id), :alt => "用户头像" %>
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word mt-4">
         <% 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_url_in_org(activity.author_id), :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_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
         <% end %>
         TO
         <%= link_to activity.project.name.to_s+" | 项目讨论区",project_boards_path(activity.project), :class => "newsBlue ml15 mr5"%>
@@ -85,14 +85,14 @@
                 <% replies_all_i=replies_all_i+1 %>
                 <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>3 ? 'none' : '' %>">
                   <div class="homepagePostReplyPortrait">
-                    <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_path(reply.author_id), :alt => "用户头像" %>
+                    <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_url_in_org(reply.author_id), :alt => "用户头像" %>
                   </div>
                   <div class="homepagePostReplyDes">
                     <div class="homepagePostReplyPublisher mt-4">
                       <% if reply.try(:author).try(:realname) == ' ' %>
-                          <%= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
+                          <%= link_to reply.try(:author), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %>
                       <% else %>
-                          <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
+                          <%= link_to reply.try(:author).try(:realname), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
                       <%= format_time(reply.created_on) %>
                       <span id="reply_praise_count_<%=reply.id %>">
@@ -114,7 +114,7 @@
     <% end %>
 
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
-      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_url_in_org(activity.author_id), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
         <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
           <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb
index da458636a..2584e4209 100644
--- a/app/views/organizations/_show_org_document.html.erb
+++ b/app/views/organizations/_show_org_document.html.erb
@@ -1,12 +1,12 @@
 <div class="resources mt10" id="organization_document_<%= document.id %>">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(User.find(document.creator_id)), :width => 45, :heigth => 45), user_path(document.creator_id) %>
+      <%= link_to image_tag(url_to_avatar(User.find(document.creator_id)), :width => 45, :heigth => 45), user_url_in_org(document.creator_id) %>
       <%= render :partial => 'users/show_detail_info', :locals => {:user => User.find(document.creator_id)} %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo">
-        <%= link_to User.find(document.creator_id), user_path(document.creator.id), :class => "newsBlue mr15" %>
+        <%= link_to User.find(document.creator_id), user_url_in_org(document.creator.id), :class => "newsBlue mr15" %>
         TO&nbsp;&nbsp;<%= link_to document.organization.name, organization_path(document.organization), :class => "newsBlue" %>
         |
             <span style="color:#269ac9;"><%= document.org_subfield_id.nil? ? "组织文章" :"#{OrgSubfield.find(document.org_subfield_id).name}" %></span>
@@ -87,10 +87,10 @@
         <% comments_for_doc.each do |comment| %>
             <% reply_id += 1 %>
             <li style="display:<%= reply_id > 3 ? 'none' : '' %>">
-              <div class="homepagePostReplyPortrait"><%= link_to image_tag(url_to_avatar(User.find(comment.creator_id)), :width => 33, :height => 33, :alt => "用户头像"), user_path(comment.creator_id) %></div>
+              <div class="homepagePostReplyPortrait"><%= link_to image_tag(url_to_avatar(User.find(comment.creator_id)), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_id) %></div>
               <div class="homepagePostReplyDes">
                 <div class="homepagePostReplyPublisher">
-                  <%= link_to User.find(comment.creator_id), user_path(comment.creator_id), :class => "newsBlue mr10 f14" %>
+                  <%= link_to User.find(comment.creator_id), user_url_in_org(comment.creator_id), :class => "newsBlue mr10 f14" %>
                   <%= format_activity_day(comment.created_at) %> <%= format_time(comment.created_at, false) %>
                   <span id="reply_praise_count_<%=comment.id %>">
                           <% if comment.creator_id.to_i == User.current.id.to_i %>
@@ -111,7 +111,7 @@
     </div>
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= act.id %>">
-        <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33", :alt => "用户头像"), user_path(User.current) %>
+        <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33", :alt => "用户头像"), user_url_in_org(User.current) %>
       </div>
       <div class="homepagePostReplyInputContainer">
         <div nhname='new_message_<%= act.id %>' style="display:none;">
diff --git a/app/views/users/_show_detail_info.html.erb b/app/views/users/_show_detail_info.html.erb
index 9de431336..f2a2faeb3 100644
--- a/app/views/users/_show_detail_info.html.erb
+++ b/app/views/users/_show_detail_info.html.erb
@@ -1,6 +1,6 @@
 <div class="userCard boxShadow" style="<%= User.current == user ? 'top:-153px;':'' %>">
   <div class="userAvatarWrap fl">
-    <%= link_to image_tag(url_to_avatar(user), :width => "50", :height => "50"), user_path(user), :alt => "用户头像", :target => '_blank' %>
+    <%= link_to image_tag(url_to_avatar(user), :width => "50", :height => "50"), user_url_in_org(user), :alt => "用户头像", :target => '_blank' %>
     <%#= image_tag(url_to_avatar(user), :width => "50", :height => "50") %>
     <!--<img src="images/homepageImage.jpg" width="50" height="50" alt="个人头像"  />-->
   </div>