add more one stage for domain
This commit is contained in:
parent
041fd78678
commit
47f23a0cdd
|
@ -3,7 +3,8 @@ class RulingTemplatesController < ApplicationController
|
||||||
store_token = params[:store_token]
|
store_token = params[:store_token]
|
||||||
site_domain = RegisteredSite.find_by(:uid => store_token).site_domain
|
site_domain = RegisteredSite.find_by(:uid => store_token).site_domain
|
||||||
root_domain = site_domain.sub(/(?:(?!\.).)*\./,'') rescue ''
|
root_domain = site_domain.sub(/(?:(?!\.).)*\./,'') rescue ''
|
||||||
templates = RTemplate.where(:allow_domain.in => [site_domain,root_domain,'',nil]).asc(:updated_at).collect do |v|
|
root_domain2 = root_domain.sub(/(?:(?!\.).)*\./,'') rescue ''
|
||||||
|
templates = RTemplate.where(:allow_domain.in => [site_domain,root_domain,root_domain2,'',nil]).asc(:updated_at).collect do |v|
|
||||||
{
|
{
|
||||||
'install_flag' => v.installed_site_tokens.include?(store_token),
|
'install_flag' => v.installed_site_tokens.include?(store_token),
|
||||||
'uid' => v.uid,
|
'uid' => v.uid,
|
||||||
|
@ -19,7 +20,8 @@ class RulingTemplatesController < ApplicationController
|
||||||
store_token = params[:store_token]
|
store_token = params[:store_token]
|
||||||
site_domain = RegisteredSite.find_by(:uid => store_token).site_domain
|
site_domain = RegisteredSite.find_by(:uid => store_token).site_domain
|
||||||
root_domain = site_domain.sub(/(?:(?!\.).)*\./,'') rescue ''
|
root_domain = site_domain.sub(/(?:(?!\.).)*\./,'') rescue ''
|
||||||
r_template = RTemplate.where(:allow_domain.in => [site_domain,root_domain,'',nil], uid: template_uid).first
|
root_domain2 = root_domain.sub(/(?:(?!\.).)*\./,'') rescue ''
|
||||||
|
r_template = RTemplate.where(:allow_domain.in => [site_domain,root_domain,root_domain2,'',nil], uid: template_uid).first
|
||||||
if r_template.nil?
|
if r_template.nil?
|
||||||
render :json => {}.to_json
|
render :json => {}.to_json
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue