From c51f725a78c612c72d342a46fd966156077c46e8 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 1 Sep 2016 11:24:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=9A=90=E8=97=8F=E4=B9=8B?=
 =?UTF-8?q?=20=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81=E4=B8=AD=E8=AE=A8?=
 =?UTF-8?q?=E8=AE=BA=E5=8C=BA=20=E6=96=B0=E9=97=BB=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E8=AF=BE=E7=A8=8B=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/_project_news.html.erb | 7 ++++++-
 app/views/users/_project_message.html.erb | 6 +++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/views/projects/_project_news.html.erb b/app/views/projects/_project_news.html.erb
index 161221526..6b3e8e43c 100644
--- a/app/views/projects/_project_news.html.erb
+++ b/app/views/projects/_project_news.html.erb
@@ -38,7 +38,12 @@
               <li class="homepagePostSettingIcon">
                 <% if User.current.logged? %>
                     <ul class="homepagePostSettiongText">
-                      <li><%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}',#{User.current.id},'news')")  %></li>
+                      <% if hidden_unproject_infos %>
+                          <li><%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}',#{User.current.id},'news')")  %></li>
+                      <% else %>
+                          <li><%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send_hidden('#{activity.id}',#{User.current.id},'news')")  %></li>
+                      <% end %>
+
                       <li>
                         <%= link_to(l(:button_edit), {:controller => 'news', :action => 'edit', :id => activity}, :class => 'postOptionLink') if activity.author == User.current %>
                       </li>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index afc45efde..5ee3ff0ba 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -68,7 +68,11 @@
                             ) if activity.destroyable_by?(User.current) %>
                       </li>
                   <% end %>
-                  <li><%= link_to "发送", "javascript:void(0);", :onclick => "show_send(#{activity.id}, #{User.current.id}, 'message');", :class => "postOptionLink" %></li>
+                  <% if hidden_unproject_infos %>
+                      <li><%= link_to "发送", "javascript:void(0);", :onclick => "show_send(#{activity.id}, #{User.current.id}, 'message');", :class => "postOptionLink" %></li>
+                  <% else %>
+                      <li><%= link_to "发送", "javascript:void(0);", :onclick => "show_send_hidden(#{activity.id}, #{User.current.id}, 'message');", :class => "postOptionLink" %></li>
+                  <% end %>
                 </ul>
               </li>
             </ul>