Commit 0f21d9c55fa1d7ce4f5e8cf61c989e8db350dcad

Authored by Karpikau Andrei
1 parent 1661b386

check domain as global variable

@@ -30,7 +30,7 @@ module Kanjai @@ -30,7 +30,7 @@ module Kanjai
30 30
31 if current_admin_user || @page_data.page.private_flag == true || use_cache == false 31 if current_admin_user || @page_data.page.private_flag == true || use_cache == false
32 layer = @page_data.page.page_template.get_html_content 32 layer = @page_data.page.page_template.get_html_content
33 - content_for_render = setTemplateContent(@page_data.page.page_template, layer, @page_data) 33 + content_for_render = setTemplateContent(@page_data.page.domain, @page_data.page.page_template, layer, @page_data)
34 34
35 respond_to do |format| 35 respond_to do |format|
36 format.html{render :plain => content_for_render} 36 format.html{render :plain => content_for_render}
@@ -40,7 +40,7 @@ module Kanjai @@ -40,7 +40,7 @@ module Kanjai
40 else 40 else
41 if stale?(last_modified: @page_data.last_modified, etag: @page_data.cache_key_with_version) 41 if stale?(last_modified: @page_data.last_modified, etag: @page_data.cache_key_with_version)
42 layer = @page_data.page.page_template.get_html_content 42 layer = @page_data.page.page_template.get_html_content
43 - content_for_render = setTemplateContent(@page_data.page.page_template, layer, @page_data) 43 + content_for_render = setTemplateContent(@page_data.page.domain, @page_data.page.page_template, layer, @page_data)
44 respond_to do |format| 44 respond_to do |format|
45 format.html{render :plain => content_for_render} 45 format.html{render :plain => content_for_render}
46 end 46 end
@@ -69,7 +69,7 @@ module Kanjai @@ -69,7 +69,7 @@ module Kanjai
69 end 69 end
70 70
71 71
72 - def setTemplateContent(page_template, layer, page_data) 72 + def setTemplateContent(domain, page_template, layer, page_data)
73 73
74 $scheme = 'http://' 74 $scheme = 'http://'
75 75
@@ -89,7 +89,7 @@ module Kanjai @@ -89,7 +89,7 @@ module Kanjai
89 template_part = page_template.template_parts.find_by_code(code) 89 template_part = page_template.template_parts.find_by_code(code)
90 90
91 if template_part 91 if template_part
92 - html = TemplateGenerator::subpart_generate(page_template, template_part.part_type, template_part.elements) 92 + html = TemplateGenerator::subpart_generate(domain, page_template, template_part.part_type, template_part.elements)
93 layer.gsub!(content, html) 93 layer.gsub!(content, html)
94 end 94 end
95 95
@@ -107,7 +107,7 @@ module Kanjai @@ -107,7 +107,7 @@ module Kanjai
107 template_part = page_template.template_parts.find_by_code(code) 107 template_part = page_template.template_parts.find_by_code(code)
108 108
109 if template_part 109 if template_part
110 - html = TemplateGenerator::subpart_generate(page_template, template_part.part_type, template_part.elements) 110 + html = TemplateGenerator::subpart_generate(domain, page_template, template_part.part_type, template_part.elements)
111 layer.gsub!(content, html) 111 layer.gsub!(content, html)
112 end 112 end
113 end 113 end
@@ -34,29 +34,29 @@ module Kanjai @@ -34,29 +34,29 @@ module Kanjai
34 34
35 def get_page 35 def get_page
36 @url = get_page_url 36 @url = get_page_url
37 - $original_fullpath = request.original_fullpath  
38 - $original_format = request.format 37 + original_fullpath = request.original_fullpath
  38 + original_format = request.format
39 39
40 domain_title = request.domain 40 domain_title = request.domain
41 if request.subdomain.to_s.present? 41 if request.subdomain.to_s.present?
42 domain_title = "#{request.subdomain}.#{domain_title}" 42 domain_title = "#{request.subdomain}.#{domain_title}"
43 end 43 end
44 44
45 - $domain = Domain.where(title: domain_title).first 45 + domain = Domain.where(title: domain_title).first
46 46
47 lang = nil 47 lang = nil
48 48
49 - if $domain.nil? 49 + if domain.nil?
50 # try found alternative domain 50 # try found alternative domain
51 lang_domain = LanguageDomain.joins(:page_langs).where(title: domain_title, kanjai_page_langs: {default_use: false}).first 51 lang_domain = LanguageDomain.joins(:page_langs).where(title: domain_title, kanjai_page_langs: {default_use: false}).first
52 if lang_domain && lang_domain.page_langs.count > 0 52 if lang_domain && lang_domain.page_langs.count > 0
53 - $domain = lang_domain.domain 53 + domain = lang_domain.domain
54 lang = lang_domain.page_langs.where(default_use: false).first.code 54 lang = lang_domain.page_langs.where(default_use: false).first.code
55 else 55 else
56 render plain: "Domain #{domain_title} Not Exist" and return 56 render plain: "Domain #{domain_title} Not Exist" and return
57 end 57 end
58 else 58 else
59 - lang = $domain.page_langs.where(default_use: true).first.try(:code) 59 + lang = domain.page_langs.where(default_use: true).first.try(:code)
60 end 60 end
61 61
62 if params && params[:locale].present? && request.original_fullpath.split('/')[1].length == 2 62 if params && params[:locale].present? && request.original_fullpath.split('/')[1].length == 2
@@ -70,13 +70,13 @@ module Kanjai @@ -70,13 +70,13 @@ module Kanjai
70 70
71 #@page_data = PageDatum.where(:url => @url).first 71 #@page_data = PageDatum.where(:url => @url).first
72 #$current_locale = PageLang.where(default_use: true).first.code 72 #$current_locale = PageLang.where(default_use: true).first.code
73 - @page_data = PageDatum.joins(page: :domain).where(kanjai_domains: {id: $domain.id}).where(:url => @url, lang: I18n.locale).first 73 + @page_data = PageDatum.joins(page: :domain).where(kanjai_domains: {id: domain.id}).where(:url => @url, lang: I18n.locale).first
74 $current_locale = I18n.locale 74 $current_locale = I18n.locale
75 if @page_data.nil? 75 if @page_data.nil?
76 mas = @url.split('/') 76 mas = @url.split('/')
77 if mas.length > 1 77 if mas.length > 1
78 @url = '/' + mas[1] + '/:path' 78 @url = '/' + mas[1] + '/:path'
79 - @page_data = PageDatum.joins(page: :domain).where(kanjai_domains: {id: $domain.id}).where(:url => @url, lang: I18n.locale).first 79 + @page_data = PageDatum.joins(page: :domain).where(kanjai_domains: {id: domain.id}).where(:url => @url, lang: I18n.locale).first
80 end 80 end
81 end 81 end
82 82
@@ -85,7 +85,7 @@ module Kanjai @@ -85,7 +85,7 @@ module Kanjai
85 #$current_locale = @page_data.lang 85 #$current_locale = @page_data.lang
86 else 86 else
87 if @url == '/' 87 if @url == '/'
88 - root_page = Page.joins(:domain).where(kanjai_domains: {id: $domain.id}).where(root_page: true).first 88 + root_page = Page.joins(:domain).where(kanjai_domains: {id: domain.id}).where(root_page: true).first
89 if root_page 89 if root_page
90 redirect_to root_page.menu_url($scheme) 90 redirect_to root_page.menu_url($scheme)
91 end 91 end
@@ -145,7 +145,7 @@ module Kanjai @@ -145,7 +145,7 @@ module Kanjai
145 page_template = self.page.page_template 145 page_template = self.page.page_template
146 subpart = page_template.template_parts.find_by_code(self.type_content) 146 subpart = page_template.template_parts.find_by_code(self.type_content)
147 if subpart 147 if subpart
148 - html = Kanjai::TemplateGenerator.subpart_generate(page_template, 'content', subpart.elements, self.marker_hash, self.id) 148 + html = Kanjai::TemplateGenerator.subpart_generate(self.page.domain, page_template, 'content', subpart.elements, self.marker_hash, self.id)
149 else 149 else
150 html = '' 150 html = ''
151 end 151 end
1 module Kanjai 1 module Kanjai
2 module TemplateGenerator 2 module TemplateGenerator
3 - def self.subpart_generate(page_template, type, elements, hash_value = nil, page_content_id = nil) 3 + def self.subpart_generate(domain, page_template, type, elements, hash_value = nil, page_content_id = nil)
4 @doc = Nokogiri::HTML::DocumentFragment.parse "" 4 @doc = Nokogiri::HTML::DocumentFragment.parse ""
5 5
6 @original_hash_value = hash_value 6 @original_hash_value = hash_value
@@ -9,7 +9,7 @@ module Kanjai @@ -9,7 +9,7 @@ module Kanjai
9 @page_content_id = page_content_id 9 @page_content_id = page_content_id
10 10
11 Nokogiri::HTML::Builder.with(@doc) do |subparts| 11 Nokogiri::HTML::Builder.with(@doc) do |subparts|
12 - TemplateGenerator.method("#{type}_generator").call(elements, subparts, @original_hash_value[0]) 12 + TemplateGenerator.method("#{type}_generator").call(domain, elements, subparts, @original_hash_value[0])
13 end 13 end
14 14
15 @doc.css("img[@src]").each do |x| 15 @doc.css("img[@src]").each do |x|
@@ -24,7 +24,7 @@ module Kanjai @@ -24,7 +24,7 @@ module Kanjai
24 24
25 25
26 26
27 - def self.menu_generator(elements, subparts, hash_value, current_page = nil) 27 + def self.menu_generator(domain, elements, subparts, hash_value, current_page = nil)
28 elements.each do |item| 28 elements.each do |item|
29 case item[:name] 29 case item[:name]
30 when 'text' 30 when 'text'
@@ -143,7 +143,7 @@ module Kanjai @@ -143,7 +143,7 @@ module Kanjai
143 143
144 end 144 end
145 145
146 - def self.language_generator(elements, subparts, hash_value) 146 + def self.language_generator(domain, elements, subparts, hash_value)
147 elements.each do |item| 147 elements.each do |item|
148 case item[:name] 148 case item[:name]
149 when 'text' 149 when 'text'
@@ -210,7 +210,7 @@ module Kanjai @@ -210,7 +210,7 @@ module Kanjai
210 end 210 end
211 211
212 212
213 - def self.content_generator(elements, subparts, hash_value) 213 + def self.content_generator(domain, elements, subparts, hash_value)
214 elements.each do |item| 214 elements.each do |item|
215 case item[:name] 215 case item[:name]
216 when 'text' 216 when 'text'
@@ -248,7 +248,7 @@ module Kanjai @@ -248,7 +248,7 @@ module Kanjai
248 248
249 end 249 end
250 250
251 - def self.system_generator(elements, subparts, hash_value) 251 + def self.system_generator(domain, elements, subparts, hash_value)
252 str = '' 252 str = ''
253 controller_item = elements.select{|item| item[:name] == 'controller' }.first 253 controller_item = elements.select{|item| item[:name] == 'controller' }.first
254 action_item = elements.select{|item| item[:name] == 'action' }.first 254 action_item = elements.select{|item| item[:name] == 'action' }.first
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.211" 2 + VERSION = "0.0.212"
3 end 3 end