Commit 999bca5adb140e234b00f60f6d8978dc4573ee0c

Authored by Karpikau Andrei
1 parent b1ee67b6

remove global variables

@@ -38,13 +38,13 @@ module Kanjai @@ -38,13 +38,13 @@ module Kanjai
38 38
39 #render :text => content_for_render and return 39 #render :text => content_for_render and return
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.domain, @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
47 - #end 47 + end
48 end 48 end
49 else 49 else
50 page_content = get_html_by_json_client(@page_data) 50 page_content = get_html_by_json_client(@page_data)
@@ -89,10 +89,10 @@ module Kanjai @@ -89,10 +89,10 @@ module Kanjai
89 if root_page 89 if root_page
90 redirect_to root_page.menu_url(session[:scheme]) 90 redirect_to root_page.menu_url(session[:scheme])
91 else 91 else
92 - render text: "Can not found page #{@url} for domain #{domain_title}" and return 92 + render plain: "Can not found page #{@url} for domain #{domain_title}" and return
93 end 93 end
94 else 94 else
95 - render text: "Can not found page #{@url} for domain #{domain_title}" and return 95 + render plain: "Can not found page #{@url} for domain #{domain_title}" and return
96 end 96 end
97 end 97 end
98 session[:url] = @url 98 session[:url] = @url
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.221" 2 + VERSION = "0.0.222"
3 end 3 end