Showing
3 changed files
with
12 additions
and
7 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="14" max-vertical-offset="2160"> | ||
| 51 | - <caret line="18" column="67" selection-start-line="18" selection-start-column="67" selection-end-line="18" selection-end-column="67" /> | 50 | + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2235"> |
| 51 | + <caret line="26" column="59" selection-start-line="26" selection-start-column="59" selection-end-line="26" selection-end-column="59" /> | ||
| 52 | <folding /> | 52 | <folding /> |
| 53 | </state> | 53 | </state> |
| 54 | </provider> | 54 | </provider> |
| @@ -938,8 +938,8 @@ | @@ -938,8 +938,8 @@ | ||
| 938 | </entry> | 938 | </entry> |
| 939 | <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> | 939 | <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> |
| 940 | <provider selected="true" editor-type-id="text-editor"> | 940 | <provider selected="true" editor-type-id="text-editor"> |
| 941 | - <state vertical-scroll-proportion="0.0" vertical-offset="14" max-vertical-offset="2160"> | ||
| 942 | - <caret line="18" column="67" selection-start-line="18" selection-start-column="67" selection-end-line="18" selection-end-column="67" /> | 941 | + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2235"> |
| 942 | + <caret line="26" column="59" selection-start-line="26" selection-start-column="59" selection-end-line="26" selection-end-column="59" /> | ||
| 943 | <folding /> | 943 | <folding /> |
| 944 | </state> | 944 | </state> |
| 945 | </provider> | 945 | </provider> |
| @@ -16,11 +16,16 @@ module Kanjai | @@ -16,11 +16,16 @@ 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 current_admin_user or stale?(@page_data, public: true) | ||
| 20 | - #get page content | 19 | + if current_admin_user |
| 21 | layer = @page_data.page.page_template.get_html_content | 20 | layer = @page_data.page.page_template.get_html_content |
| 22 | content_for_render = setTemplateContent(@page_data.page.page_template, layer, @page_data) | 21 | content_for_render = setTemplateContent(@page_data.page.page_template, layer, @page_data) |
| 23 | render :text => content_for_render and return | 22 | render :text => content_for_render and return |
| 23 | + else | ||
| 24 | + if stale?(@page_data, public: true) | ||
| 25 | + layer = @page_data.page.page_template.get_html_content | ||
| 26 | + content_for_render = setTemplateContent(@page_data.page.page_template, layer, @page_data) | ||
| 27 | + render :text => content_for_render and return | ||
| 28 | + end | ||
| 24 | end | 29 | end |
| 25 | #render :html => content_for_render.html_safe | 30 | #render :html => content_for_render.html_safe |
| 26 | else | 31 | else |