|
...
|
...
|
@@ -38,13 +38,13 @@ module Kanjai |
|
38
|
38
|
|
|
39
|
39
|
#render :text => content_for_render and return
|
|
40
|
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
|
42
|
layer = @page_data.page.page_template.get_html_content
|
|
43
|
43
|
content_for_render = setTemplateContent(@page_data.page.domain, @page_data.page.page_template, layer, @page_data)
|
|
44
|
44
|
respond_to do |format|
|
|
45
|
45
|
format.html{render :plain => content_for_render}
|
|
46
|
46
|
end
|
|
47
|
|
- #end
|
|
|
47
|
+ end
|
|
48
|
48
|
end
|
|
49
|
49
|
else
|
|
50
|
50
|
page_content = get_html_by_json_client(@page_data)
|
...
|
...
|
|