Commit a1fab1a63638a6e4c8c6239db6746ca3d36ff6ba

Authored by Karpikau Andrei
1 parent dc6de786

change kanjai version

... ... @@ -47,8 +47,8 @@
47 47 <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
48 48 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
49 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 52 <folding />
53 53 </state>
54 54 </provider>
... ... @@ -938,8 +938,8 @@
938 938 </entry>
939 939 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
940 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 943 <folding />
944 944 </state>
945 945 </provider>
... ...
... ... @@ -16,11 +16,16 @@ module Kanjai
16 16 end
17 17 #look - exist template or not for page
18 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 20 layer = @page_data.page.page_template.get_html_content
22 21 content_for_render = setTemplateContent(@page_data.page.page_template, layer, @page_data)
23 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 29 end
25 30 #render :html => content_for_render.html_safe
26 31 else
... ...
1 1 module Kanjai
2   - VERSION = "0.0.30"
  2 + VERSION = "0.0.31"
3 3 end
... ...