EDIT / kanjai · Commits

Commit 36d57f7554af0b44a2bb79b2b7efe35f72d147f5

Authored by Karpikau Andrei
1 parent 2b9db4b4

change kanjai version

Inline Side-by-side
Showing 4 changed files with 21 additions and 13 deletions
@@ -117,8 +117,8 @@ @@ -117,8 +117,8 @@
117 <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false"> 117 <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
118 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> 118 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
119 <provider selected="true" editor-type-id="text-editor"> 119 <provider selected="true" editor-type-id="text-editor">
120 - <state vertical-scroll-proportion="0.0" vertical-offset="90" max-vertical-offset="2565">  
121 - <caret line="20" column="71" selection-start-line="20" selection-start-column="71" selection-end-line="20" selection-end-column="71" /> 120 + <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="2685">
  121 + <caret line="28" column="93" selection-start-line="28" selection-start-column="93" selection-end-line="28" selection-end-column="93" />
122 <folding /> 122 <folding />
123 </state> 123 </state>
124 </provider> 124 </provider>
@@ -186,9 +186,9 @@ @@ -186,9 +186,9 @@
186 <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" /> 186 <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
187 <option value="$PROJECT_DIR$/lib/kanjai/template_parser.rb" /> 187 <option value="$PROJECT_DIR$/lib/kanjai/template_parser.rb" />
188 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" /> 188 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" />
189 - <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />  
190 <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" /> 189 <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />
191 <option value="$PROJECT_DIR$/app/models/kanjai/page.rb" /> 190 <option value="$PROJECT_DIR$/app/models/kanjai/page.rb" />
  191 + <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
192 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" /> 192 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
193 </list> 193 </list>
194 </option> 194 </option>
@@ -586,7 +586,7 @@ @@ -586,7 +586,7 @@
586 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> 586 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
587 <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" /> 587 <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" />
588 <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" /> 588 <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" />
589 - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.41760904" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 589 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.41760904" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
590 <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 590 <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
591 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> 591 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
592 <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> 592 <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -1002,18 +1002,18 @@ @@ -1002,18 +1002,18 @@
1002 </state> 1002 </state>
1003 </provider> 1003 </provider>
1004 </entry> 1004 </entry>
1005 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> 1005 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
1006 <provider selected="true" editor-type-id="text-editor"> 1006 <provider selected="true" editor-type-id="text-editor">
1007 - <state vertical-scroll-proportion="0.0" vertical-offset="90" max-vertical-offset="2565">  
1008 - <caret line="20" column="71" selection-start-line="20" selection-start-column="71" selection-end-line="20" selection-end-column="71" /> 1007 + <state vertical-scroll-proportion="-10.259259" vertical-offset="728" max-vertical-offset="1410">
  1008 + <caret line="67" column="10" selection-start-line="67" selection-start-column="10" selection-end-line="67" selection-end-column="10" />
1009 <folding /> 1009 <folding />
1010 </state> 1010 </state>
1011 </provider> 1011 </provider>
1012 </entry> 1012 </entry>
1013 - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb"> 1013 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
1014 <provider selected="true" editor-type-id="text-editor"> 1014 <provider selected="true" editor-type-id="text-editor">
1015 - <state vertical-scroll-proportion="-10.259259" vertical-offset="728" max-vertical-offset="1410">  
1016 - <caret line="67" column="10" selection-start-line="67" selection-start-column="10" selection-end-line="67" selection-end-column="10" /> 1015 + <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="2685">
  1016 + <caret line="28" column="93" selection-start-line="28" selection-start-column="93" selection-end-line="28" selection-end-column="93" />
1017 <folding /> 1017 <folding />
1018 </state> 1018 </state>
1019 </provider> 1019 </provider>
1 PATH 1 PATH
2 remote: . 2 remote: .
3 specs: 3 specs:
4 - kanjai (0.0.49) 4 + kanjai (0.0.50)
5 acts_as_list 5 acts_as_list
6 acts_as_tree 6 acts_as_tree
7 aws-sdk 7 aws-sdk
@@ -18,7 +18,15 @@ module Kanjai @@ -18,7 +18,15 @@ module Kanjai
18 end 18 end
19 #look - exist template or not for page 19 #look - exist template or not for page
20 if @page_data.page.page_template 20 if @page_data.page.page_template
21 - if current_admin_user || @page_data.page.private_flag == true 21 + use_cache = true
  22 + if !!UserSession
  23 + if UserSession.current_user
  24 + use_cache = false
  25 + end
  26 + end
  27 +
  28 +
  29 + if current_admin_user || @page_data.page.private_flag == true || use_cache == false
22 layer = @page_data.page.page_template.get_html_content 30 layer = @page_data.page.page_template.get_html_content
23 content_for_render = setTemplateContent(@page_data.page.page_template, layer, @page_data) 31 content_for_render = setTemplateContent(@page_data.page.page_template, layer, @page_data)
24 render :text => content_for_render and return 32 render :text => content_for_render and return
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.50" 2 + VERSION = "0.0.51"
3 end 3 end