From 06e90c83e40513601bd5ee8ecc61720cf257b792 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 4 May 2016 20:12:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E7=9B=AE=E5=BD=95=E4=B8=8D?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=8E=92=E5=88=97=E5=AE=9A=E5=88=B6=E5=92=8C?=
 =?UTF-8?q?=E5=9F=9F=E5=90=8D=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizations/_subfield_list.html.erb     | 115 +-----------------
 .../_subfield_sub_domains_list.html.erb       |  37 ++++++
 2 files changed, 38 insertions(+), 114 deletions(-)
 create mode 100644 app/views/organizations/_subfield_sub_domains_list.html.erb

diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb
index 2961b97a0..464fb66e4 100644
--- a/app/views/organizations/_subfield_list.html.erb
+++ b/app/views/organizations/_subfield_list.html.erb
@@ -102,120 +102,7 @@
             <%= link_to("添加二级目录", new_org_subfield_sub_domain_path(:org_subfield_id => field.id, :field => field), :class => "linkGrey fr mr5", :remote => true) %>
           </li>
           <div class="cl"></div>
-          <ul class="orgSubList">
-            <li class="orgSubTree"></li>
-            <li class="orgSubNum ml5 mr5">
-              <div id="show_priority_<%= field.id %>" ondblclick="edit_priority('#show_priority_<%= field.id %>','#edit_priority_<%= field.id %>');"  class="subNumBlock" title="双击可编辑">
-                <%= field.priority %>
-              </div>
-              <div id="edit_priority_<%= field.id %>" style="display:none; width:30px;">
-                <input type="text" onblur="update_priority('#show_priority_<%= field.id %>','#edit_priority_<%= field.id %>','<%= field.id %>',$(this).val());" style="width:20px;" value="<%= field.priority %>"/>
-              </div>
-            </li>
-            <li class="orgSubColumn">
-              <div id="subfield_show_<%= field.id %>"><%= field.name %></div>
-              <div id="subfield_edit_<%= field.id %>" style="display:none;">
-                <input type="text" name="name" onblur="update_subfield('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>','<%= field.id %>',$(this).val());" value="<%= field.name %>" style="width:70px;"/>
-              </div>
-            </li>
-            <li class="orgSubStatus">新增</li>
-            <li class="orgSubOrder">
-              <% if field.field_type == "Resource" %>
-                  列表
-              <% else %>
-                  <%= form_tag({:controller => 'org_subfields', :action => 'update_status', :id => field.id,},:remote=>'true', :method => 'post', :id=>"update_status_form_#{field.id}", :class => 'query_form') do %>
-                      <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,
-                                  { :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 %>
-            </li>
-            <li class="orgSubType"><%= field.field_type == "Post" ? "帖子" : "资源" %></li>
-            <li class="orgSubCatalog hidden">
-              <% if Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 %>
-                  <div id="sub_dir_show_<%= field.id %>" ondblclick="edit_dir('#sub_dir_show_<%= field.id %>','#sub_dir_edit_<%= field.id %>');" class="subNumBlock" title="双击可编辑">
-                    <%= field.subfield_subdomain_dir.nil? ?  '未设置': field.subfield_subdomain_dir.name  %>
-                  </div>
-              <% else %>
-                  <div id="sub_dir_show_<%= field.id %>" >
-                    <%= field.subfield_subdomain_dir.nil? ?  '未设置': field.subfield_subdomain_dir.name  %>
-                  </div>
-              <% end %>
-              <div id="sub_dir_edit_<%= field.id %>" style="display:none;">
-                <input type="text" name="name" onfocus="observe_input_to_lowercase($(this));" onblur="update_sub_dir('#sub_dir_show_<%= field.id %>','#sub_dir_edit_<%= field.id %>','<%= field.id %>',$(this).val().toLowerCase());" value="<%= field.subfield_subdomain_dir.nil? ?  '': field.subfield_subdomain_dir.name %>" style="width:70px;"/>
-              </div>
-            </li>
-            <%#= link_to "隐藏", hide_org_subfield_organizations_path(field), :method => 'post', :remote => true, :id => "hide_#{field.id}", :class => "linkBlue fr mr5" %>
-            <li class="orgSubOperation">
-              <a href="javascript:void(0);" class="linkGrey fr ml5 mr10" onclick="hide($(this),'<%= field.id %>');" id="hide_<%= field.id %>"><%= field.hide==0?"隐藏":"可见" %></a>
-              <span class="fr">|</span>
-              <%= link_to "删除", org_subfield_path(field), :method => 'delete', :remote => true, :confirm => "您确定删除吗？", :class => "linkGrey fr ml5 mr5" %>
-              <span class="fr">|</span>
-              <a href="javascript:void(0);" class="linkGrey fr ml5 mr5" onclick="edit('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>');">编辑</a>
-            </li>
-            <div class="cl"></div>
-          </ul>
-          <ul class="orgSubList">
-            <li class="orgSubTree"></li>
-            <li class="orgSubNum ml5 mr5">
-              <div id="show_priority_<%= field.id %>" ondblclick="edit_priority('#show_priority_<%= field.id %>','#edit_priority_<%= field.id %>');"  class="subNumBlock" title="双击可编辑">
-                <%= field.priority %>
-              </div>
-              <div id="edit_priority_<%= field.id %>" style="display:none; width:30px;">
-                <input type="text" onblur="update_priority('#show_priority_<%= field.id %>','#edit_priority_<%= field.id %>','<%= field.id %>',$(this).val());" style="width:20px;" value="<%= field.priority %>"/>
-              </div>
-            </li>
-            <li class="orgSubColumn">
-              <div id="subfield_show_<%= field.id %>"><%= field.name %></div>
-              <div id="subfield_edit_<%= field.id %>" style="display:none;">
-                <input type="text" name="name" onblur="update_subfield('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>','<%= field.id %>',$(this).val());" value="<%= field.name %>" style="width:70px;"/>
-              </div>
-            </li>
-            <li class="orgSubStatus">新增</li>
-            <li class="orgSubOrder">
-              <% if field.field_type == "Resource" %>
-                  列表
-              <% else %>
-                  <%= form_tag({:controller => 'org_subfields', :action => 'update_status', :id => field.id,},:remote=>'true', :method => 'post', :id=>"update_status_form_#{field.id}", :class => 'query_form') do %>
-                      <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,
-                                  { :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 %>
-            </li>
-            <li class="orgSubType"><%= field.field_type == "Post" ? "帖子" : "资源" %></li>
-            <li class="orgSubCatalog hidden">
-              <% if Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 %>
-                  <div id="sub_dir_show_<%= field.id %>" ondblclick="edit_dir('#sub_dir_show_<%= field.id %>','#sub_dir_edit_<%= field.id %>');"  class="subNumBlock" title="双击可编辑">
-                    <%= field.subfield_subdomain_dir.nil? ?  '未设置': field.subfield_subdomain_dir.name  %>
-                  </div>
-              <% else %>
-                  <div id="sub_dir_show_<%= field.id %>" >
-                    <%= field.subfield_subdomain_dir.nil? ?  '未设置': field.subfield_subdomain_dir.name  %>
-                  </div>
-              <% end %>
-              <div id="sub_dir_edit_<%= field.id %>" style="display:none;">
-                <input type="text" name="name" onfocus="observe_input_to_lowercase($(this));" onblur="update_sub_dir('#sub_dir_show_<%= field.id %>','#sub_dir_edit_<%= field.id %>','<%= field.id %>',$(this).val().toLowerCase());" value="<%= field.subfield_subdomain_dir.nil? ?  '': field.subfield_subdomain_dir.name %>" style="width:70px;"/>
-              </div>
-            </li>
-            <%#= link_to "隐藏", hide_org_subfield_organizations_path(field), :method => 'post', :remote => true, :id => "hide_#{field.id}", :class => "linkBlue fr mr5" %>
-            <li class="orgSubOperation">
-              <a href="javascript:void(0);" class="linkGrey fr ml5 mr10" onclick="hide($(this),'<%= field.id %>');" id="hide_<%= field.id %>"><%= field.hide==0?"隐藏":"可见" %></a>
-              <span class="fr">|</span>
-              <%= link_to "删除", org_subfield_path(field), :method => 'delete', :remote => true, :confirm => "您确定删除吗？", :class => "linkGrey fr ml5 mr5" %>
-              <span class="fr">|</span>
-              <a href="javascript:void(0);" class="linkGrey fr ml5 mr5" onclick="edit('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>');">编辑</a>
-            </li>
-            <div class="cl"></div>
-          </ul>
+          <%= render :partial => 'organizations/subfield_sub_domains_list', :locals => {:field => field} %>
         </ul>
     <% end %>
 <% end %>
diff --git a/app/views/organizations/_subfield_sub_domains_list.html.erb b/app/views/organizations/_subfield_sub_domains_list.html.erb
new file mode 100644
index 000000000..20bd31ede
--- /dev/null
+++ b/app/views/organizations/_subfield_sub_domains_list.html.erb
@@ -0,0 +1,37 @@
+<% sub_domains = field.sub_domains %>
+<% if sub_domains %>
+    <% sub_domains.each do |subdomain| %>
+        <ul class="orgSubList">
+          <li class="orgSubTree"></li>
+          <li class="orgSubNum ml5 mr5">
+            <div id="show_priority_<%= subdomain.id %>" ondblclick="edit_priority('#show_priority_<%= subdomain.id %>','#edit_priority_<%= subdomain.id %>');"  class="subNumBlock" title="双击可编辑">
+              <%= subdomain.priority %>
+            </div>
+            <div id="edit_priority_<%= subdomain.id %>" style="display:none; width:30px;">
+              <input type="text" onblur="update_priority('#show_priority_<%= subdomain.id %>','#edit_priority_<%= subdomain.id %>','<%= subdomain.id %>',$(this).val());" style="width:20px;" value="<%= subdomain.priority %>"/>
+            </div>
+          </li>
+          <li class="orgSubColumn">
+            <div id="subsubdomain_show_<%= subdomain.id %>"><%= subdomain.name %></div>
+            <div id="subsubdomain_edit_<%= subdomain.id %>" style="display:none;">
+              <input type="text" name="name" onblur="update_subsubdomain('#subsubdomain_show_<%= subdomain.id %>','#subsubdomain_edit_<%= subdomain.id %>','<%= subdomain.id %>',$(this).val());" value="<%= subdomain.name %>" style="width:70px;"/>
+            </div>
+          </li>
+          <li class="orgSubStatus">新增</li>
+          <li class="orgSubOrder">
+            默认
+          </li>
+          <li class="orgSubType"><%= subdomain.field_type == "Post" ? "帖子" : "资源" %></li>
+          <li class="orgListCatalog hidden"> -- </li>
+          <%#= link_to "隐藏", hide_org_subsubdomain_organizations_path(subdomain), :method => 'post', :remote => true, :id => "hide_#{subdomain.id}", :class => "linkBlue fr mr5" %>
+          <li class="orgSubOperation">
+            <a href="javascript:void(0);" class="linkGrey fr ml5 mr10" onclick="hide($(this),'<%= subdomain.id %>');" id="hide_<%= subdomain.id %>"><%= subdomain.hide==0?"隐藏":"可见" %></a>
+            <span class="fr">|</span>
+            <%= link_to "删除", org_subfield_sub_domain_path(subdomain), :method => 'delete', :remote => true, :confirm => "您确定删除吗？", :class => "linkGrey fr ml5 mr5" %>
+            <span class="fr">|</span>
+            <a href="javascript:void(0);" class="linkGrey fr ml5 mr5" onclick="edit('#subsubdomain_show_<%= subdomain.id %>','#subsubdomain_edit_<%= subdomain.id %>');">编辑</a>
+          </li>
+          <div class="cl"></div>
+        </ul>
+    <% end %>
+<% end %>