EDIT / kanjai · Commits

Commit dc6de786b66c4f411c880086b524490ebb1aa195

Authored by Karpikau Andrei
1 parent 421cb911

change kanjai version

Inline Side-by-side
Showing 4 changed files with 6 additions and 6 deletions
@@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
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"> 50 <state vertical-scroll-proportion="0.0" vertical-offset="14" max-vertical-offset="2160">
51 - <caret line="23" column="10" selection-start-line="23" selection-start-column="10" selection-end-line="23" selection-end-column="10" /> 51 + <caret line="18" column="67" selection-start-line="18" selection-start-column="67" selection-end-line="18" selection-end-column="67" />
52 <folding /> 52 <folding />
53 </state> 53 </state>
54 </provider> 54 </provider>
@@ -542,7 +542,7 @@ @@ -542,7 +542,7 @@
542 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 542 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
543 <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 543 <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
544 <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 544 <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
545 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.27786753" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 545 + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.27786753" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
546 <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> 546 <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
547 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> 547 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
548 <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 548 <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -939,7 +939,7 @@ @@ -939,7 +939,7 @@
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"> 941 <state vertical-scroll-proportion="0.0" vertical-offset="14" max-vertical-offset="2160">
942 - <caret line="23" column="10" selection-start-line="23" selection-start-column="10" selection-end-line="23" selection-end-column="10" /> 942 + <caret line="18" column="67" selection-start-line="18" selection-start-column="67" selection-end-line="18" selection-end-column="67" />
943 <folding /> 943 <folding />
944 </state> 944 </state>
945 </provider> 945 </provider>
1 PATH 1 PATH
2 remote: . 2 remote: .
3 specs: 3 specs:
4 - kanjai (0.0.28) 4 + kanjai (0.0.29)
5 acts_as_list 5 acts_as_list
6 acts_as_tree 6 acts_as_tree
7 aws-sdk 7 aws-sdk
@@ -16,7 +16,7 @@ module Kanjai @@ -16,7 +16,7 @@ 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 current_admin_user or stale?(@page_data, public: true)
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)
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.29" 2 + VERSION = "0.0.30"
3 end 3 end