From 0cf2279cf512611c2bab826a239c7ad53befe87b Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 29 Dec 2015 16:46:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=80=E4=B8=8Bbug:=201.?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=EF=BC=9A=E5=BC=95=E7=94=A8=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E8=87=B3=E6=9F=90=E6=A0=8F=E7=9B=AE=EF=BC=8C=E8=8B=A5=E8=AF=A5?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=8F=AA=E6=9C=89=E4=B8=80=E4=B8=AA=E6=A0=8F?=
 =?UTF-8?q?=E7=9B=AE=EF=BC=8C=E4=B8=94=E8=AF=A5=E8=B5=84=E6=BA=90=E5=B7=B2?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E5=BC=95=E7=94=A8=E8=87=B3=E8=AF=A5=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E6=A0=8F=E7=9B=AE=EF=BC=8C=E5=A6=82=E5=9B=BE=E5=B0=B1?=
 =?UTF-8?q?=E4=B8=8D=E8=A6=81=E5=86=8D=E6=98=BE=E7=A4=BA=E4=B8=BA=E2=80=9C?=
 =?UTF-8?q?=E9=80=89=E5=85=A5=E7=BB=84=E7=BB=87=E5=85=B6=E4=BB=96=E6=A0=8F?=
 =?UTF-8?q?=E7=9B=AE=E2=80=9D=E4=BA=86=202.=E7=BB=84=E7=BB=87:=E5=8F=AA?=
 =?UTF-8?q?=E6=9C=89=E7=AE=A1=E7=90=86=E5=91=98=E6=89=8D=E8=83=BD=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E8=AF=BE=E7=A8=8B/=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/_org_subfield_list.html.erb              | 2 +-
 app/views/organizations/_org_left_subfield_list.html.erb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/files/_org_subfield_list.html.erb b/app/views/files/_org_subfield_list.html.erb
index 029570047..ad90550d4 100644
--- a/app/views/files/_org_subfield_list.html.erb
+++ b/app/views/files/_org_subfield_list.html.erb
@@ -30,7 +30,7 @@
               <% if User.current.logged? %>
                   <% if !@org_subfield.attachments.all.include?file %>
                     <%= link_to("选入栏目",quote_resource_show_org_subfield_org_subfield_file_path(:org_subfield_id => @org_subfield.id, :id => file.id),:class => "f_l re_select c_lorange",:remote => true) %>
-                  <% else %>
+                  <% elsif @org_subfield.organization.org_subfields.where("field_type='Resource'").count > 1 %>
                     <%= link_to("选入组织其他栏目",quote_resource_show_org_subfield_org_subfield_file_path(:org_subfield_id => @org_subfield.id, :id => file.id),:class => "f_l re_select c_lorange",:remote => true) %>
                   <% end %>
                   <%= file_preview_tag(file, class: 'f_l re_open', style:'text-align: center;') %>
diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb
index 4d85342a6..fa276605c 100644
--- a/app/views/organizations/_org_left_subfield_list.html.erb
+++ b/app/views/organizations/_org_left_subfield_list.html.erb
@@ -3,7 +3,7 @@
 </div>
 <div class="homepageLeftMenuBlock">
   <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuProjects').slideToggle();">项目</a>
-  <% if User.current.logged? %>
+  <% if User.current.logged? and User.current.admin_of_org?(organization) %>
     <%=link_to "", join_project_menu_organization_path(organization),:remote => true, :method => "post", :class => "homepageMenuSetting fr", :title => "关联项目"%>
   <% end %>
 </div>
@@ -14,7 +14,7 @@
 </div>
 <div class="homepageLeftMenuBlock">
   <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuCourses').slideToggle();">课程</a>
-  <% if User.current.logged? %>
+  <% if User.current.logged? and User.current.admin_of_org?(organization) %>
     <%=link_to "", join_course_menu_organization_path(organization),:remote => true, :method => "post", :class => "homepageMenuSetting fr", :title => "关联课程"%>
   <% end %>
 </div>