Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou

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

app/helpers/sub_domains_helper.rb

@@ -1,2 +1,3 @@
 module SubDomainsHelper
+  include OrganizationsHelper
 end

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){

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>