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 @@
<%= subdomain.hide==0?"隐藏":"可见" %>
|
- <%= 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" %>
|
编辑
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'