From 0b43fb550213cc7959db0d307b6d872a425e8a8f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 6 May 2016 09:49:15 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=8F=AF=E8=A7=81=E5=8F=8A?=
 =?UTF-8?q?=E7=AE=AD=E5=A4=B4=E7=9A=84=E5=B1=80=E9=83=A8=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb                        | 2 +-
 app/views/organizations/_org_left_subfield_list.html.erb | 6 +++---
 app/views/organizations/_subfield_list.html.erb          | 5 ++---
 app/views/sub_domains/hide_sub_domain.js.erb             | 3 ++-
 app/views/sub_domains/show_sub_domain.js.erb             | 3 ++-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 07738fc9c..471ed41f1 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -38,7 +38,7 @@ module ApplicationHelper
   end
 
   def if_hidden_subdomain  field
-    domains = field.sub_domains.map{|domain| domain.hide.to_i == 0}
+    domains = field.sub_domains.select{|domain| domain.hide.to_i == 0}
     result = domains.length > 0 ? true : false
     return result
   end
diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb
index 1d12ff54b..f943d29b5 100644
--- a/app/views/organizations/_org_left_subfield_list.html.erb
+++ b/app/views/organizations/_org_left_subfield_list.html.erb
@@ -107,14 +107,14 @@
                     <%=link_to "", new_organization_org_document_comment_path(organization, :field_id => field.id), :method => "get", :class => "homepageMenuSetting fr", :title => "发布帖子" %>
                 <% end %>
               </div>
-              <div class="<%= field.sub_domains.count == 0?'homepageLeftMenuCourses':'homepageLeftMenuCourses borderBottomNone' %>" id="PostDomain_<%= field.id %>" style="display:none;">
+              <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('created_at').uniq.limit(5), :org_subfield_id => field.id} %>
                 </ul>
               </div>
 
-              <% unless field.sub_domains.count == 0 %>
-                  <li class="homepageLeftMenuMore">
+              <% 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 %>
diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb
index 464fb66e4..fc537d655 100644
--- a/app/views/organizations/_subfield_list.html.erb
+++ b/app/views/organizations/_subfield_list.html.erb
@@ -31,9 +31,8 @@
                     <div class="update_status_class"><span  class="hidden"><%= subfield_list_type(field.status) %></span>
                       <a style="display: inline-block;" href="javascript:void(0)" class="pic_edit2"></a>
                     </div>
-                    <%= select( :name,:group_id, subfield_status_option_default,
-                                { :include_blank => false,:selected => field.status},
-                                {:onchange=>"update_status('#update_status_form_#{field.id}');", :id =>"field_status_id", :name => "status",:class=>"undis class-edit fl", :style => "width:56px;"}) %>
+                    <%= select( :name,:group_id, subfield_status_option_default, { :include_blank => false,:selected => field.status},
+                           { :onchange=>"update_status('#update_status_form_#{field.id}');", :id =>"field_status_id", :name => "status",:class=>"undis class-edit fl", :style => "width:56px;"}) %>
                 <% end %>
             <% end %>
 
diff --git a/app/views/sub_domains/hide_sub_domain.js.erb b/app/views/sub_domains/hide_sub_domain.js.erb
index e60297d36..eec025b97 100644
--- a/app/views/sub_domains/hide_sub_domain.js.erb
+++ b/app/views/sub_domains/hide_sub_domain.js.erb
@@ -1,2 +1,3 @@
 $("#hide_<%= @subdomain.id %>").text("可见");
-$("#sub_domain_hide_<%= @subdomain.id %>").css("display", "none");
\ No newline at end of file
+$("#sub_domain_hide_<%= @subdomain.id %>").css("display", "none");
+$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
\ No newline at end of file
diff --git a/app/views/sub_domains/show_sub_domain.js.erb b/app/views/sub_domains/show_sub_domain.js.erb
index 03af41d1b..c74413c6c 100644
--- a/app/views/sub_domains/show_sub_domain.js.erb
+++ b/app/views/sub_domains/show_sub_domain.js.erb
@@ -1,2 +1,3 @@
 $("#hide_<%= @subdomain.id %>").text("隐藏");
-$("#sub_domain_hide_<%= @subdomain.id %>").css("display", "block");
\ No newline at end of file
+$("#sub_domain_hide_<%= @subdomain.id %>").css("display", "block");
+$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
\ No newline at end of file