fix error

This commit is contained in:
chiu 2021-04-19 09:42:09 +08:00
parent f150f95379
commit 041fd78678
1 changed files with 6 additions and 4 deletions

View File

@ -1,8 +1,9 @@
class RulingTemplatesController < ApplicationController
def index
store_token = params[:store_token]
site_domain = RegisteredSite.find_by(:uid => store_token).site_domain.sub(/(?:(?!\.).)*\./,'') rescue ''
templates = RTemplate.where(:allow_domain.in => [site_domain,'',nil]).asc(:updated_at).collect do |v|
site_domain = RegisteredSite.find_by(:uid => store_token).site_domain
root_domain = site_domain.sub(/(?:(?!\.).)*\./,'') rescue ''
templates = RTemplate.where(:allow_domain.in => [site_domain,root_domain,'',nil]).asc(:updated_at).collect do |v|
{
'install_flag' => v.installed_site_tokens.include?(store_token),
'uid' => v.uid,
@ -16,8 +17,9 @@ class RulingTemplatesController < ApplicationController
def get_template_zip
template_uid = params[:template_uid]
store_token = params[:store_token]
site_domain = RegisteredSite.find_by(:uid => store_token).site_domain.sub(/(?:(?!\.).)*\./,'') rescue ''
r_template = RTemplate.where(allow_domain: site_domain, uid: template_uid).first
site_domain = RegisteredSite.find_by(:uid => store_token).site_domain
root_domain = site_domain.sub(/(?:(?!\.).)*\./,'') rescue ''
r_template = RTemplate.where(:allow_domain.in => [site_domain,root_domain,'',nil], uid: template_uid).first
if r_template.nil?
render :json => {}.to_json
else