增加域名唯一性判断

dev_hjq v20160118
ouyangxuhua 10 years ago
parent c6aaaff8d1
commit 03df9abfeb

@ -27,7 +27,11 @@ class OrgSubfieldsController < ApplicationController
@sort = "" @sort = ""
@order = "" @order = ""
@is_remote = false @is_remote = false
if params[:id]
@organization = Organization.find(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,"+ @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 "+ "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 " org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:sub_dir_name]}'").first

@ -136,6 +136,10 @@ class OrganizationsController < ApplicationController
end end
end end
def check_uniq_domain
@is_exist = (Organization.where("domain=?", params[:org_domain]).count > 0)
end
def find_organization def find_organization
@organization = Organization.find(params[:id]) @organization = Organization.find(params[:id])
end end

@ -0,0 +1,5 @@
<% if @is_exist %>
$is_exist = true;
<% else %>
$is_exist = false;
<% end %>

@ -149,9 +149,18 @@
if ($("#subfield_name").val().trim() != "") if ($("#subfield_name").val().trim() != "")
$("#add_subfield_form").submit(); $("#add_subfield_form").submit();
} }
var $is_exist = false;
function apply_subdomain(id, domain){ function apply_subdomain(id, domain){
var reg = new RegExp("^[a-zA-Z0-9_]{1,}$"); var reg = new RegExp("^[a-zA-Z0-9_]{1,}$");
if (reg.exec(domain)){ if (reg.exec(domain)){
$.ajax({
url: "<%= check_uniq_domain_organizations_path %>",
type: 'get',
data:{
org_domain:domain
},
success:function(){
if(!$is_exist){
$.ajax({ $.ajax({
url:"<%= apply_subdomain_organization_path %>", url:"<%= apply_subdomain_organization_path %>",
type:'post', type:'post',
@ -164,6 +173,12 @@
} }
}); });
} }
else{
$("#apply_hint").text("您申请的子域名已存在,请重新输入");
}
}
});
}
else{ else{
$("#apply_hint").text("子域名命名不规范,只能包含字母、数字和下划线,请重新输入"); $("#apply_hint").text("子域名命名不规范,只能包含字母、数字和下划线,请重新输入");
} }

@ -66,6 +66,7 @@ RedmineApp::Application.routes.draw do
end end
collection do collection do
get 'check_uniq' get 'check_uniq'
get 'check_uniq_domain'
get 'autocomplete_search' get 'autocomplete_search'
post 'hide_org_subfield' post 'hide_org_subfield'
post 'show_org_subfield' post 'show_org_subfield'

Loading…
Cancel
Save