From 8dfe95dfd158377a8c8d100e14cb0cf07c1ccddc Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 4 May 2016 15:50:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B5=E9=9D=A2=E6=96=B0?=
 =?UTF-8?q?=E5=BB=BA=E4=BA=8C=E7=BA=A7=E5=9F=9F=E5=90=8D=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/sub_domains_controller.rb | 1 +
 app/helpers/sub_domains_helper.rb         | 1 +
 app/views/organizations/setting.html.erb  | 5 ++---
 app/views/sub_domains/_new.html.erb       | 5 +----
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/controllers/sub_domains_controller.rb b/app/controllers/sub_domains_controller.rb
index d16444a74..c45dff1d7 100644
--- a/app/controllers/sub_domains_controller.rb
+++ b/app/controllers/sub_domains_controller.rb
@@ -5,6 +5,7 @@ class SubDomainsController < ApplicationController
   def new
     @subdomain = SubDomain.new
     @org_subfield = OrgSubfield.find(params[:org_subfield_id])
+    @organization = @org_subfield.organization
   end
 
   def create
diff --git a/app/helpers/sub_domains_helper.rb b/app/helpers/sub_domains_helper.rb
index 8f189a38d..1a711b5e4 100644
--- a/app/helpers/sub_domains_helper.rb
+++ b/app/helpers/sub_domains_helper.rb
@@ -1,2 +1,3 @@
 module SubDomainsHelper
+  include OrganizationsHelper
 end
diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb
index 6f45bd348..396741246 100644
--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@@ -172,11 +172,10 @@
       if ($("#subfield_name").val().trim() != "")
         $("#add_subfield_form").submit();
   }
-
   function add_org_subfield_subdomain(){
       if ($("#subfield_name_subdomain").val().trim() != "")
-          alert("Test");
-          $("#add_subfield_form_subdomain").submit();
+      $("#add_subfield_form_subdomain").submit();
+      $("#org_subfield_list").html('<%= escape_javascript(render(:partial => 'organizations/subfield_list', :locals => {:subfields => @organization.org_subfields.order("priority")}  )) %>');
   }
   var $is_exist = false;
   function apply_subdomain(id, domain){
diff --git a/app/views/sub_domains/_new.html.erb b/app/views/sub_domains/_new.html.erb
index 510d469cf..ce0e802c4 100644
--- a/app/views/sub_domains/_new.html.erb
+++ b/app/views/sub_domains/_new.html.erb
@@ -23,8 +23,5 @@
 
 
 <script type="javascript">
-    function add_org_subfield_subdomain(){
-        if ($("#subfield_name_subdomain").val().trim() != "")
-        $("#add_subfield_form_subdomain").submit();
-    }
+
 </script>
\ No newline at end of file