From 3856ed80330705f5e346252d7ba8c147efa0b7a2 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 1 Sep 2016 11:00:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=9A=90=E8=97=8F=E4=B9=8B?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=8F=91=E9=80=81=E9=A1=B9=E7=9B=AE=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../users/_resource_share_for_orgs.html.erb     | 17 ++++++++++++-----
 .../_resource_share_for_project_popup.html.erb  | 17 ++++++++++++-----
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/app/views/users/_resource_share_for_orgs.html.erb b/app/views/users/_resource_share_for_orgs.html.erb
index 36d1c774f..b5aafcb7e 100644
--- a/app/views/users/_resource_share_for_orgs.html.erb
+++ b/app/views/users/_resource_share_for_orgs.html.erb
@@ -4,11 +4,18 @@
       <% unless send_ids.blank? %>
           <% send_ids = send_ids.class == String ? send_ids : send_ids.join(",") %>
       <% end %>
-      <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>
+      <% 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, :type => @type),:method => 'get',
                 :remote=>true,:id=>'search_user_org_form' do %>
diff --git a/app/views/users/_resource_share_for_project_popup.html.erb b/app/views/users/_resource_share_for_project_popup.html.erb
index b521bcb90..41133a91e 100644
--- a/app/views/users/_resource_share_for_project_popup.html.erb
+++ b/app/views/users/_resource_share_for_project_popup.html.erb
@@ -5,11 +5,18 @@
       <% unless send_ids.blank? %>
           <% send_ids = send_ids.class == String ? send_ids : send_ids.join(",") %>
       <% end %>
-      <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>
+      <% 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>