From 6bfe344cbf8cfe0cf6b72af36590173f7a391c0b Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 31 May 2016 13:59:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A8=A1=E5=BC=8F=E4=B8=80?=
 =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_org_left_subfield_list.html.erb          | 38 +++----------------
 1 file changed, 6 insertions(+), 32 deletions(-)

diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb
index b51b57afb..e621df8bd 100644
--- a/app/views/organizations/_org_left_subfield_list.html.erb
+++ b/app/views/organizations/_org_left_subfield_list.html.erb
@@ -112,46 +112,20 @@
                   <%= render :partial => 'organizations/org_subdomain',:locals=>{:subdomains => field.sub_domains.reorder('priority').uniq, :org_subfield_id => field.id} %>
                 </ul>
               </div>
-
               <% unless (field.sub_domains.count == 0 || !if_hidden_subdomain(field)) %>
                   <li class="homepageLeftMenuMore" id="sub_domain_jiantou_<%= field %>">
                     <a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="$('#PostDomain_<%= field.id %>').slideToggle();" style="border-bottom: 1px solid #ddd;"></a>
                   </li>
               <% end %>
-          <% elsif field.field_type == "Comptec" %>
+          <% elsif field.field_type == "Comptec" && User.current.admin?  %>
               <div class="homepageLeftMenuBlock">
-                <!--<a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuProjects').slideToggle();">项目</a>-->
-                <% if !field.subfield_subdomain_dir.nil? %> <!--讨论帖子-->
-                    <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", organization.id).map(&:subname).include?(request.subdomain) %>
-                        <%= link_to "#{field.name}", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
-                    <% else %>
-                        <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
-                    <% end %>
-                <% else %>
-                    <% if field.field_type == "Comptec" && User.current.admin? %>
-                        <%= link_to "#{field.name}", teachers_organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
-                    <% elsif field.field_type == "Compstu" && User.current.admin? %>
-                        <%= link_to "#{field.name}", students_organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
-                    <% elsif field.field_type != "Comptec" && field.field_type != "Compstu" %>
-                        <%= link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
-                    <% end %>
-                <% end %>
-                <% if User.current.logged? and User.current.admin_of_org?(organization) && field.field_type != "Comptec" && field.field_type != "Compstu" %>
-                    <%=link_to "", new_organization_org_document_comment_path(organization, :field_id => field.id), :method => "get", :class => "homepageMenuSetting fr", :title => "发布帖子" %>
-                <% end %>
+                <%= link_to "#{field.name}", teachers_organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
               </div>
-              <div class="<%= (field.sub_domains.count == 0) ? 'homepageLeftMenuCourses':'homepageLeftMenuCourses borderBottomNone' %>" id="PostDomain_<%= field.id %>" style="display:none;">
-                <ul>
-                  <%= render :partial => 'organizations/org_subdomain',:locals=>{:subdomains => field.sub_domains.reorder('priority').uniq.limit(5), :org_subfield_id => field.id} %>
-                </ul>
+          <% elsif field.field_type == "Compstu" && User.current.admin? %>
+              <div class="homepageLeftMenuBlock">
+                <%= link_to "#{field.name}", students_organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
               </div>
-
-              <% unless (field.sub_domains.count == 0 || !if_hidden_subdomain(field)) %>
-                  <li class="homepageLeftMenuMore" id="sub_domain_jiantou_<%= field %>">
-                    <a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="$('#PostDomain_<%= field.id %>').slideToggle();" style="border-bottom: 1px solid #ddd;"></a>
-                  </li>
-              <% end %>
-          <% else %>
+          <% elsif field.field_type == "Resource" %>
               <div class="homepageLeftMenuBlock">
                   <% if !field.subfield_subdomain_dir.nil? %>
                       <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", organization.id).map(&:subname).include?(request.subdomain) %>