From 6d28d0becdbc7064abe61d0cde7f879204ec97c3 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 5 May 2016 12:27:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E5=9F=9F=E5=90=8D=E7=9A=84?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/sub_domains_controller.rb                   | 6 ++++++
 app/views/organizations/_subfield_sub_domains_list.html.erb | 2 +-
 app/views/sub_domains/destroy.js.erb                        | 4 ++++
 config/routes.rb                                            | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 app/views/sub_domains/destroy.js.erb

diff --git a/app/controllers/sub_domains_controller.rb b/app/controllers/sub_domains_controller.rb
index abf32e305..f2943236b 100644
--- a/app/controllers/sub_domains_controller.rb
+++ b/app/controllers/sub_domains_controller.rb
@@ -27,6 +27,12 @@ class SubDomainsController < ApplicationController
     @subdomain.update_column(:name, params[:name])
   end
 
+  def destroy
+    @subdomain = SubDomain.find(params[:id])
+    @subfield = OrgSubfield.find(params[:org_subfield_id])
+    @organization = @subfield.organization
+    @subdomain.destroy
+  end
 
   def show
     render_404
diff --git a/app/views/organizations/_subfield_sub_domains_list.html.erb b/app/views/organizations/_subfield_sub_domains_list.html.erb
index 177e5ec0b..42e7a8e55 100644
--- a/app/views/organizations/_subfield_sub_domains_list.html.erb
+++ b/app/views/organizations/_subfield_sub_domains_list.html.erb
@@ -27,7 +27,7 @@
           <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 "删除", setting_organization_path(@organization), :method => 'delete', :remote => true, :confirm => "您确定删除吗？", :class => "linkGrey fr ml5 mr5" %>
+            <%= link_to "删除", org_subfield_sub_domain_path(subdomain, :org_subfield_id => subdomain.org_subfield.id), :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>
diff --git a/app/views/sub_domains/destroy.js.erb b/app/views/sub_domains/destroy.js.erb
new file mode 100644
index 000000000..913c400f7
--- /dev/null
+++ b/app/views/sub_domains/destroy.js.erb
@@ -0,0 +1,4 @@
+$("#org_subfield_list").html("");
+$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list', :locals => {:subfields => @organization.org_subfields.order("priority") }) %>");
+$("#sub_field_left_lists").html("");
+$("#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/config/routes.rb b/config/routes.rb
index 4ab7140d5..575ab11f3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -118,7 +118,7 @@ RedmineApp::Application.routes.draw do
       end
     end
 
-    resources :sub_domains, :only => [:index, :new, :create, :show, :update] do
+    resources :sub_domains, :only => [:index, :new, :create, :show, :update, :destroy] do
       resources :sub_document_comments, :only => [:index, :new, :create, :show] do
         member do
           post 'add_reply'