harrybomrah
/
client_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug.

This commit is contained in:
BoHung Chiu 2021-10-08 20:12:01 +08:00
parent 23d659a6da
commit aaf224ae42
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/models/site_construct.rb
View File

@ -230,10 +230,11 @@ class SiteConstruct
custom_default_domain_name = "" custom_default_domain_name = ""
domain_names = domain_name.strip().split(" ") domain_names = domain_name.strip().split(" ")
if default_domain_idx == -1 if default_domain_idx == -1
custom_default_domain_name = site_server.default_domain_names.select do |default_domain_name| site_server.default_domain_names.each do |default_domain_name|
default_domain_name = Regexp.new("\\A"+default_domain_name.gsub(".","\\.").gsub("*","[^.]*")) default_domain_name = Regexp.new("\\A"+default_domain_name.gsub(".","\\.").gsub("*","[^.]*"))
domain_names.select{|n| n.match(default_domain_name) }.count != 0 custom_default_domain_name = domain_names.select{|n| n.match(default_domain_name) }.first
end.first break if custom_default_domain_name.present?
end
else else
custom_default_domain_name = domain_names[default_domain_idx] custom_default_domain_name = domain_names[default_domain_idx]
end end