EDIT / kanjai · Commits

Commit ba9a8a3991aca7a5f5cd39fda61d5f95d9b64940

Authored by Karpikau Andrei
1 parent 5ec49d7e

change version

Inline Side-by-side
Showing 2 changed files with 38 additions and 21 deletions
@@ -34,11 +34,21 @@ @@ -34,11 +34,21 @@
34 </provider> 34 </provider>
35 </entry> 35 </entry>
36 </file> 36 </file>
37 - <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false"> 37 + <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="true">
38 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> 38 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
39 <provider selected="true" editor-type-id="text-editor"> 39 <provider selected="true" editor-type-id="text-editor">
40 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2385">  
41 - <caret line="23" column="12" selection-start-line="23" selection-start-column="12" selection-end-line="23" selection-end-column="12" /> 40 + <state vertical-scroll-proportion="0.5741325" vertical-offset="1826" max-vertical-offset="2490">
  41 + <caret line="146" column="0" selection-start-line="146" selection-start-column="0" selection-end-line="146" selection-end-column="0" />
  42 + <folding />
  43 + </state>
  44 + </provider>
  45 + </entry>
  46 + </file>
  47 + <file leaf-file-name="site_controller.rb" pinned="false" current-in-tab="false">
  48 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
  49 + <provider selected="true" editor-type-id="text-editor">
  50 + <state vertical-scroll-proportion="0.0" vertical-offset="225" max-vertical-offset="885">
  51 + <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
42 <folding /> 52 <folding />
43 </state> 53 </state>
44 </provider> 54 </provider>
@@ -84,10 +94,10 @@ @@ -84,10 +94,10 @@
84 </provider> 94 </provider>
85 </entry> 95 </entry>
86 </file> 96 </file>
87 - <file leaf-file-name="version.rb" pinned="false" current-in-tab="true"> 97 + <file leaf-file-name="version.rb" pinned="false" current-in-tab="false">
88 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> 98 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
89 <provider selected="true" editor-type-id="text-editor"> 99 <provider selected="true" editor-type-id="text-editor">
90 - <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634"> 100 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="135">
91 <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" /> 101 <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
92 <folding /> 102 <folding />
93 </state> 103 </state>
@@ -168,8 +178,8 @@ @@ -168,8 +178,8 @@
168 <option value="$PROJECT_DIR$/lib/kanjai/template_parser.rb" /> 178 <option value="$PROJECT_DIR$/lib/kanjai/template_parser.rb" />
169 <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" /> 179 <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />
170 <option value="$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb" /> 180 <option value="$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb" />
171 - <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />  
172 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" /> 181 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
  182 + <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
173 </list> 183 </list>
174 </option> 184 </option>
175 </component> 185 </component>
@@ -815,14 +825,6 @@ @@ -815,14 +825,6 @@
815 </state> 825 </state>
816 </provider> 826 </provider>
817 </entry> 827 </entry>
818 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">  
819 - <provider selected="true" editor-type-id="text-editor">  
820 - <state vertical-scroll-proportion="0.0" vertical-offset="251" max-vertical-offset="885">  
821 - <caret line="48" column="7" selection-start-line="48" selection-start-column="7" selection-end-line="48" selection-end-column="7" />  
822 - <folding />  
823 - </state>  
824 - </provider>  
825 - </entry>  
826 <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/bootstrap.css.scss.erb"> 828 <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/bootstrap.css.scss.erb">
827 <provider selected="true" editor-type-id="text-editor"> 829 <provider selected="true" editor-type-id="text-editor">
828 <state vertical-scroll-proportion="-8.875" vertical-offset="3822" max-vertical-offset="95070"> 830 <state vertical-scroll-proportion="-8.875" vertical-offset="3822" max-vertical-offset="95070">
@@ -924,18 +926,26 @@ @@ -924,18 +926,26 @@
924 </state> 926 </state>
925 </provider> 927 </provider>
926 </entry> 928 </entry>
927 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> 929 + <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
928 <provider selected="true" editor-type-id="text-editor"> 930 <provider selected="true" editor-type-id="text-editor">
929 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2385">  
930 - <caret line="23" column="12" selection-start-line="23" selection-start-column="12" selection-end-line="23" selection-end-column="12" /> 931 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="135">
  932 + <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
931 <folding /> 933 <folding />
932 </state> 934 </state>
933 </provider> 935 </provider>
934 </entry> 936 </entry>
935 - <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> 937 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
936 <provider selected="true" editor-type-id="text-editor"> 938 <provider selected="true" editor-type-id="text-editor">
937 - <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">  
938 - <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" /> 939 + <state vertical-scroll-proportion="0.0" vertical-offset="225" max-vertical-offset="885">
  940 + <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
  941 + <folding />
  942 + </state>
  943 + </provider>
  944 + </entry>
  945 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  946 + <provider selected="true" editor-type-id="text-editor">
  947 + <state vertical-scroll-proportion="0.5741325" vertical-offset="1826" max-vertical-offset="2490">
  948 + <caret line="146" column="0" selection-start-line="146" selection-start-column="0" selection-end-line="146" selection-end-column="0" />
939 <folding /> 949 <folding />
940 </state> 950 </state>
941 </provider> 951 </provider>
@@ -3,6 +3,8 @@ module Kanjai @@ -3,6 +3,8 @@ module Kanjai
3 3
4 include Admin::PagesHelper 4 include Admin::PagesHelper
5 5
  6 + after_filter :skip_set_cookies_header
  7 +
6 8
7 def show 9 def show
8 #expires_in 10.minutes, :public => true 10 #expires_in 10.minutes, :public => true
@@ -21,7 +23,6 @@ module Kanjai @@ -21,7 +23,6 @@ module Kanjai
21 content_for_render = setTemplateContent(@page_data.page.page_template, layer, @page_data) 23 content_for_render = setTemplateContent(@page_data.page.page_template, layer, @page_data)
22 render :text => content_for_render and return 24 render :text => content_for_render and return
23 else 25 else
24 - ::Application.config.session_store :disabled  
25 if stale?(@page_data, public: true) 26 if stale?(@page_data, public: true)
26 layer = @page_data.page.page_template.get_html_content 27 layer = @page_data.page.page_template.get_html_content
27 content_for_render = setTemplateContent(@page_data.page.page_template, layer, @page_data) 28 content_for_render = setTemplateContent(@page_data.page.page_template, layer, @page_data)
@@ -148,6 +149,12 @@ module Kanjai @@ -148,6 +149,12 @@ module Kanjai
148 149
149 end 150 end
150 151
  152 + def skip_set_cookies_header
  153 + unless current_admin_user
  154 + request.session_options = {}
  155 + end
  156 + end
  157 +
151 158
152 159
153 end 160 end