From 65bf816ea4ea9abafde502cce55af54b014a5a41 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jun 2016 17:03:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=96=E5=AD=90=E8=AE=BE=E4=B8=BA=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E5=90=8E=EF=BC=8C=E4=B8=8D=E5=9C=A8=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E4=BA=8C=E4=B8=AD=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/organizations/_org_custom_left1.html.erb | 6 +++---
 app/views/organizations/_org_custom_left2.html.erb | 2 +-
 app/views/organizations/_org_custom_left3.html.erb | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/organizations/_org_custom_left1.html.erb b/app/views/organizations/_org_custom_left1.html.erb
index 335ed1b2c..91c0e320e 100644
--- a/app/views/organizations/_org_custom_left1.html.erb
+++ b/app/views/organizations/_org_custom_left1.html.erb
@@ -9,7 +9,7 @@
       <ul class="por_hotbar_left fl">
         <% if acts.count > 1 %>
             <% acts[1..2].each do |activity| %>
-                <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+                <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
                     <% document = activity.org_act %>
                     <li>
                       <%= link_to "<span class='por_icons_hot fl'>热门推荐</span>#{document.title}".html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hot_title link-black', :target => "_blank", :title => document.title %>
@@ -57,7 +57,7 @@
 
         <% if acts.count > 3 %>
             <% activity = acts[3] %>
-            <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+            <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
                 <% document = activity.org_act %>
                 <li>
                   <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hot_title link-black', :target => "_blank", :title => document.title %>
@@ -106,7 +106,7 @@
 
       <%# if acts.count > 3 %>
           <% activity = acts.first %>
-          <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+          <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment'  %>
               <% document = activity.org_act %>
               <div class="por_hotbar_right fl">
                 <% if get_image_path_from_content(document.content).nil? %>
diff --git a/app/views/organizations/_org_custom_left2.html.erb b/app/views/organizations/_org_custom_left2.html.erb
index f07053566..2c389766f 100644
--- a/app/views/organizations/_org_custom_left2.html.erb
+++ b/app/views/organizations/_org_custom_left2.html.erb
@@ -131,7 +131,7 @@
               <%= render :partial => 'organizations/link_subfield_more', :locals => {:field => field} %>
             </h2>
             <% org_acts.first(4).each do |activity| %>
-                <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+                <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
                     <% document = activity.org_act %>
                     <% org_subfield_id = params[:org_subfield_id] %>
                     <% iamge_path = get_image_path_from_content(document.content) %>
diff --git a/app/views/organizations/_org_custom_left3.html.erb b/app/views/organizations/_org_custom_left3.html.erb
index bcfac4933..cdd683944 100644
--- a/app/views/organizations/_org_custom_left3.html.erb
+++ b/app/views/organizations/_org_custom_left3.html.erb
@@ -9,7 +9,7 @@
       <div class="por_post_left fl">
         <div class="por_post_leftbar ">
           <% activity = acts.first %>
-          <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+          <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
               <% document = activity.org_act %>
               <% if get_image_path_from_content(document.content).nil? %>
                   <%= link_to image_tag("/images/default_blank/mo-3.jpg", :width => "299", :height => "246"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
@@ -73,7 +73,7 @@
 
           <% unless acts[1..5].nil? %>
               <% acts[1..5].each do |activity| %>
-                  <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+                  <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
                       <% document = activity.org_act %>
                       <ul class="por_post_list">
                         <li><%= link_to "<span class='post_icons_grey fl'></span>#{document.title}".html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hidden_w390 link-black', :target => "_blank" %></li>
@@ -115,7 +115,7 @@
           <div class="fl">
             <ul class="por_post_right por_post_list">
               <% acts[6..19].each do |activity| %>
-                  <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+                  <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
                       <% document = activity.org_act %>
                       <li><%= link_to "<span class='post_icons_grey fl'></span>#{document.title}".html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hidden_w270 link-black', :target => "_blank" %></li>
                   <% else activity.container_type == 'OrgSubfield' %>