From 1444511fd9b78d67a128d43553b296b518950827 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 1 Sep 2016 11:18:07 +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=E8=AE=A8=E8=AE=BA=E5=8C=BA=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=20=E5=8F=91=E9=80=81=E9=9A=90?=
 =?UTF-8?q?=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/messages/_project_show.html.erb       |  6 +++++-
 app/views/users/_share_message_to_org.html.erb  | 17 ++++++++++++-----
 .../users/_share_message_to_project.html.erb    | 17 ++++++++++++-----
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index ff358f7c3..41c2f7d1f 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -116,7 +116,11 @@
                               ) if @message.destroyable_by?(User.current) %>
                         </li>
                     <% end %>
-                    <li><%= link_to "发送", "javascript:void(0);", :onclick => "show_send(#{@message.id},#{User.current.id},'message');", :class => 'postOptionLink' %></li>
+                    <% if hidden_unproject_infos %>
+                        <li><%= link_to "发送", "javascript:void(0);", :onclick => "show_send(#{@message.id},#{User.current.id},'message');", :class => 'postOptionLink' %></li>
+                    <% else %>
+                        <li><%= link_to "发送", "javascript:void(0);", :onclick => "show_send_hidden(#{@message.id},#{User.current.id},'message');", :class => 'postOptionLink' %></li>
+                    <% end %>
                   </ul>
                 </li>
               </ul>
diff --git a/app/views/users/_share_message_to_org.html.erb b/app/views/users/_share_message_to_org.html.erb
index 37575a8d5..8c1d81140 100644
--- a/app/views/users/_share_message_to_org.html.erb
+++ b/app/views/users/_share_message_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 %>','message');">
-      <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_message_to_project.html.erb b/app/views/users/_share_message_to_project.html.erb
index 89b36e22a..21abd85de 100644
--- a/app/views/users/_share_message_to_project.html.erb
+++ b/app/views/users/_share_message_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 %>','message');">
-        <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>