From dda64245b3056c3b2e823f7b9295bb89b068ad30 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 26 Jan 2016 10:35:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BB=A5=E4=B8=8B=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=9A1.=E7=BC=96=E8=BE=91=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=90=8E=EF=BC=8C=E8=BF=94=E5=9B=9E=E8=87=B3?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E5=8A=A8=E6=80=81=EF=BC=9B2.=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E5=90=8D=E7=89=87=E4=B8=AD=EF=BC=8C=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=EF=BC=9B?=
 =?UTF-8?q?3.=E5=90=8C=E6=84=8F=E7=94=B3=E8=AF=B7=E5=AD=90=E5=9F=9F?=
 =?UTF-8?q?=E5=90=8D=E5=90=8E=EF=BC=8C=E6=98=BE=E7=A4=BA=E5=B7=B2=E5=90=8C?=
 =?UTF-8?q?=E6=84=8F=E7=94=B3=E8=AF=B7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/blog_comments_controller.rb | 4 ++--
 app/views/users/_show_detail_info.html.erb  | 9 +++++++--
 app/views/users/_user_message_org.html.erb  | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/controllers/blog_comments_controller.rb b/app/controllers/blog_comments_controller.rb
index df6ba10d2..055236302 100644
--- a/app/controllers/blog_comments_controller.rb
+++ b/app/controllers/blog_comments_controller.rb
@@ -55,8 +55,8 @@ class BlogCommentsController < ApplicationController
     if params[:in_act]
       redirect_to user_path(params[:user_id])
     else
-      if params[:is_homepage]
-        redirect_to user_blogs_path(params[:user_id])
+      if @article.id.eql?(User.find(params[:user_id]).blog.homepage_id)
+        redirect_to user_path(params[:user_id])
       else
         redirect_to user_blog_blog_comment_path(:user_id=>params[:user_id],:blog_id=>params[:blog_id],:id=>params[:id])
       end
diff --git a/app/views/users/_show_detail_info.html.erb b/app/views/users/_show_detail_info.html.erb
index dc6599884..9de431336 100644
--- a/app/views/users/_show_detail_info.html.erb
+++ b/app/views/users/_show_detail_info.html.erb
@@ -6,11 +6,16 @@
   </div>
   <div class="fl">
     <p class="homepageImageName mb5 hidden" style="max-width:88px;font-size:16px; color:#484848; margin-left:15px;  margin-right:8px; height:21px; float:left;"><%= user %></p>
-    <span class="homepageImageSex"></span>
+    <% if (user.user_extensions && (user.user_extensions.identity != 2) ) %>
+        <span class="<%= user.user_extensions.gender == 1 ? 'homepageImageSexWomen' : 'homepageImageSexMan' %> "></span>
+    <% end %>
+    <!--<span class="homepageImageSex"></span>-->
     <div class="cl"></div>
     <p class="mb8 c_dark f14">
       <span class="mr15 hidden fl ml15" style="max-width:90px;"><%= user.show_name %></span>
-      <%= user.user_extensions.technical_title %>
+      <% if user.user_extensions && user.user_extensions.identity %>
+        <%= get_user_roll(user) %>
+      <% end %>
     </p>
   </div>
   <div class="cl"></div>
diff --git a/app/views/users/_user_message_org.html.erb b/app/views/users/_user_message_org.html.erb
index 5bf1c8950..e3b656a46 100644
--- a/app/views/users/_user_message_org.html.erb
+++ b/app/views/users/_user_message_org.html.erb
@@ -12,7 +12,7 @@
             <%= ma.content %>
           </li>
           <li class="homepageHomeworkContentWarn fl">
-            <%=link_to (ma.organization.domain.nil? || (ma.organization.domain && ma.organization.domain != ma.content)) ? "同意申请":"已同意申请",
+            <%=link_to (ma.organization.domain.nil? || (ma.organization.domain && ma.organization.domain != ma.content)) ? "同意申请":"申请已批准",
                        agree_apply_subdomain_organizations_path( :organization_id => ma.organization_id, :org_domain => ma.content, :user_id => ma.sender_id, :act_id => ma.id ),
                        :id => "agree_apply_subdomain_#{ma.id}",
                        :method => 'post',