From b2aba0f0bc073e33030ec87ac8da360f174b9295 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 1 Sep 2016 11:12:56 +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=E6=96=B0=E9=97=BB=E5=8F=91=E9=80=81=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=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/users/_project_news.html.erb          |  7 ++++++-
 app/views/users/_share_news_to_org.html.erb     | 17 ++++++++++++-----
 app/views/users/_share_news_to_project.html.erb | 17 ++++++++++++-----
 3 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/app/views/users/_project_news.html.erb b/app/views/users/_project_news.html.erb
index 4c7ec2b04..284f5b821 100644
--- a/app/views/users/_project_news.html.erb
+++ b/app/views/users/_project_news.html.erb
@@ -35,7 +35,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),
diff --git a/app/views/users/_share_news_to_org.html.erb b/app/views/users/_share_news_to_org.html.erb
index 85d5e7104..c40e05199 100644
--- a/app/views/users/_share_news_to_org.html.erb
+++ b/app/views/users/_share_news_to_org.html.erb
@@ -1,11 +1,18 @@
 <div >
   <div class="relateText fl mb10 mr5">发送到</div>
   <div class="resourcesSendTo mr15">
-    <select class="resourcesSendType" onclick="chooseSendType('<%= send_id%>','<%= send_ids%>','<%= User.current.id %>','news');">
-      <option value="1">班级</option>
-      <option value="2">项目</option>
-      <option value="3" selected>组织</option>
-    </select>
+    <% if @hidden_unproject %>
+        <select class="resourcesSendType" onclick="chooseSendType2('<%= send_id %>','<%= send_ids %>','<%= User.current.id %>','file',  '<%= @type %>');">
+          <option value="1">班级</option>
+          <option value="2">项目</option>
+          <option value="3" selected>组织</option>
+        </select>
+    <% else %>
+        <select class="resourcesSendType" onclick="chooseSendType2hidden('<%= send_id %>', '<%= send_ids%>','<%= User.current.id %>','file', '<%= @type %>');">
+          <option value="1" >项目</option>
+          <option value="2" selected>组织</option>
+        </select>
+    <% end %>
   </div>
   <%= form_tag  search_user_org_user_path(user),:method => 'get',
                 :remote=>true,:id=>'search_user_org_form' do %>
diff --git a/app/views/users/_share_news_to_project.html.erb b/app/views/users/_share_news_to_project.html.erb
index d4c293304..c9c60198f 100644
--- a/app/views/users/_share_news_to_project.html.erb
+++ b/app/views/users/_share_news_to_project.html.erb
@@ -2,11 +2,18 @@
   <div>
     <div class="sendText fl mr10" style="width: auto">发送到</div>
     <div class="resourcesSendTo">
-      <select class="resourcesSendType" onclick="chooseSendType('<%= send_id %>','<%= send_ids %>','<%= User.current.id %>','news');">
-        <option value="1">班级</option>
-        <option value="2" selected>项目</option>
-        <option value="3">组织</option>
-      </select>
+      <% if @hidden_unproject %>
+          <select class="resourcesSendType" onclick="chooseSendType2('<%= send_id %>','<%= send_ids %>','<%= User.current.id %>','file',  '<%= @type %>');">
+            <option value="1">班级</option>
+            <option value="2" selected>项目</option>
+            <option value="3">组织</option>
+          </select>
+      <% else %>
+          <select class="resourcesSendType" onclick="chooseSendType2hidden('<%= send_id %>', '<%= send_ids%>','<%= User.current.id %>','file', '<%= @type %>');">
+            <option value="1" selected>项目</option>
+            <option value="2">组织</option>
+          </select>
+      <% end %>
     </div>
     <div class="cl"></div>
   </div>