From 03df9abfebb35fa5c780766e0d1c0cd1dd09bb9d Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Mon, 18 Jan 2016 10:43:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9F=9F=E5=90=8D=E5=94=AF?=
 =?UTF-8?q?=E4=B8=80=E6=80=A7=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/org_subfields_controller.rb   |  6 ++++-
 app/controllers/organizations_controller.rb   |  4 +++
 .../organizations/check_uniq_domain.js.erb    |  5 ++++
 app/views/organizations/setting.html.erb      | 25 +++++++++++++++----
 config/routes.rb                              |  1 +
 5 files changed, 35 insertions(+), 6 deletions(-)
 create mode 100644 app/views/organizations/check_uniq_domain.js.erb

diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb
index 9f1d964ef..d051a91f7 100644
--- a/app/controllers/org_subfields_controller.rb
+++ b/app/controllers/org_subfields_controller.rb
@@ -27,7 +27,11 @@ class OrgSubfieldsController < ApplicationController
     @sort = ""
     @order = ""
     @is_remote = false
-    @organization = Organization.find(params[:id])
+    if params[:id]
+      @organization = Organization.find(params[:id])
+    else
+      @organization = Organization.where("domain=?",request.subdomain).first
+    end
     @org_subfield = OrgSubfield.find_by_sql("select distinct org_subfields.* from org_subfields,"+
         "subfield_subdomain_dirs where org_subfields.id = subfield_subdomain_dirs.org_subfield_id and "+
         " org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:sub_dir_name]}'").first
diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index b431678af..39ece6fbe 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -136,6 +136,10 @@ class OrganizationsController < ApplicationController
     end
   end
 
+  def check_uniq_domain
+    @is_exist = (Organization.where("domain=?", params[:org_domain]).count > 0)
+  end
+
   def find_organization
     @organization = Organization.find(params[:id])
   end
diff --git a/app/views/organizations/check_uniq_domain.js.erb b/app/views/organizations/check_uniq_domain.js.erb
new file mode 100644
index 000000000..e49bb0cad
--- /dev/null
+++ b/app/views/organizations/check_uniq_domain.js.erb
@@ -0,0 +1,5 @@
+<% if @is_exist %>
+    $is_exist = true;
+<% else %>
+    $is_exist = false;
+<% end %>
\ No newline at end of file
diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb
index 962a7a497..45ac302ca 100644
--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@@ -149,18 +149,33 @@
       if ($("#subfield_name").val().trim() != "")
         $("#add_subfield_form").submit();
   }
+  var $is_exist = false;
   function apply_subdomain(id, domain){
       var reg = new RegExp("^[a-zA-Z0-9_]{1,}$");
       if (reg.exec(domain)){
           $.ajax({
-              url:"<%= apply_subdomain_organization_path %>",
-              type:'post',
+              url: "<%= check_uniq_domain_organizations_path %>",
+              type: 'get',
               data:{
-                  id:id,
-                  domain:domain
+                  org_domain:domain
               },
               success:function(){
-                  $("#apply_hint").text("您的申请已提交，系统会以消息的形式通知您结果");
+                  if(!$is_exist){
+                      $.ajax({
+                          url:"<%= apply_subdomain_organization_path %>",
+                          type:'post',
+                          data:{
+                              id:id,
+                              domain:domain
+                          },
+                          success:function(){
+                              $("#apply_hint").text("您的申请已提交，系统会以消息的形式通知您结果");
+                          }
+                      });
+                  }
+                  else{
+                      $("#apply_hint").text("您申请的子域名已存在，请重新输入");
+                  }
               }
           });
       }
diff --git a/config/routes.rb b/config/routes.rb
index ce5b09aec..67694edb7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -66,6 +66,7 @@ RedmineApp::Application.routes.draw do
     end
     collection do
       get 'check_uniq'
+      get 'check_uniq_domain'
       get 'autocomplete_search'
       post 'hide_org_subfield'
       post 'show_org_subfield'