Showing
4 changed files
with
9 additions
and
9 deletions
| @@ -47,8 +47,8 @@ | @@ -47,8 +47,8 @@ | ||
| 47 | <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false"> | 47 | <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false"> |
| 48 | <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> | 48 | <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> |
| 49 | <provider selected="true" editor-type-id="text-editor"> | 49 | <provider selected="true" editor-type-id="text-editor"> |
| 50 | - <state vertical-scroll-proportion="0.0" vertical-offset="89" max-vertical-offset="2160"> | ||
| 51 | - <caret line="18" column="44" selection-start-line="18" selection-start-column="44" selection-end-line="18" selection-end-column="44" /> | 50 | + <state vertical-scroll-proportion="0.0" vertical-offset="14" max-vertical-offset="2160"> |
| 51 | + <caret line="7" column="44" selection-start-line="7" selection-start-column="44" selection-end-line="7" selection-end-column="44" /> | ||
| 52 | <folding /> | 52 | <folding /> |
| 53 | </state> | 53 | </state> |
| 54 | </provider> | 54 | </provider> |
| @@ -960,8 +960,8 @@ | @@ -960,8 +960,8 @@ | ||
| 960 | </entry> | 960 | </entry> |
| 961 | <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> | 961 | <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> |
| 962 | <provider selected="true" editor-type-id="text-editor"> | 962 | <provider selected="true" editor-type-id="text-editor"> |
| 963 | - <state vertical-scroll-proportion="0.0" vertical-offset="89" max-vertical-offset="2160"> | ||
| 964 | - <caret line="18" column="44" selection-start-line="18" selection-start-column="44" selection-end-line="18" selection-end-column="44" /> | 963 | + <state vertical-scroll-proportion="0.0" vertical-offset="14" max-vertical-offset="2160"> |
| 964 | + <caret line="7" column="44" selection-start-line="7" selection-start-column="44" selection-end-line="7" selection-end-column="44" /> | ||
| 965 | <folding /> | 965 | <folding /> |
| 966 | </state> | 966 | </state> |
| 967 | </provider> | 967 | </provider> |
| @@ -5,7 +5,7 @@ module Kanjai | @@ -5,7 +5,7 @@ module Kanjai | ||
| 5 | 5 | ||
| 6 | 6 | ||
| 7 | def show | 7 | def show |
| 8 | - | 8 | + expires_in 10.minutes, :public => true |
| 9 | if @page_data | 9 | if @page_data |
| 10 | if @page_data.page.private_flag == true | 10 | if @page_data.page.private_flag == true |
| 11 | if !!UserSession | 11 | if !!UserSession |
| @@ -16,12 +16,12 @@ module Kanjai | @@ -16,12 +16,12 @@ module Kanjai | ||
| 16 | end | 16 | end |
| 17 | #look - exist template or not for page | 17 | #look - exist template or not for page |
| 18 | if @page_data.page.page_template | 18 | if @page_data.page.page_template |
| 19 | - if stale?(@page_data, public: true) or current_admin_user | 19 | + #if stale?(@page_data, public: true) or current_admin_user |
| 20 | #get page content | 20 | #get page content |
| 21 | layer = @page_data.page.page_template.get_html_content | 21 | layer = @page_data.page.page_template.get_html_content |
| 22 | content_for_render = setTemplateContent(@page_data.page.page_template, layer, @page_data) | 22 | content_for_render = setTemplateContent(@page_data.page.page_template, layer, @page_data) |
| 23 | render :text => content_for_render and return | 23 | render :text => content_for_render and return |
| 24 | - end | 24 | + #end |
| 25 | #render :html => content_for_render.html_safe | 25 | #render :html => content_for_render.html_safe |
| 26 | else | 26 | else |
| 27 | page_content = get_html_by_json_client(@page_data) | 27 | page_content = get_html_by_json_client(@page_data) |