EDIT / kanjai · Commits

Commit 076ed7f315562a17e07c3827a27cebb1ff0ca593

Authored by Karpikau Andrei
1 parent 24017b6a

check kanjai and frontend access

Inline Side-by-side
Showing 4 changed files with 79 additions and 74 deletions
... ... @@ -4,10 +4,8 @@
4 4 <list default="true" id="cbbcb0f9-d203-4967-aa4d-c08a939c7df0" name="Default" comment="">
5 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 6 <change beforePath="$PROJECT_DIR$/Gemfile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/Gemfile.lock" afterDir="false" />
7   - <change beforePath="$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb" beforeDir="false" afterPath="$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb" afterDir="false" />
8   - <change beforePath="$PROJECT_DIR$/app/views/kanjai/pages/show.html.erb" beforeDir="false" afterPath="$PROJECT_DIR$/app/views/kanjai/pages/show.html.erb" afterDir="false" />
9   - <change beforePath="$PROJECT_DIR$/config/initializers/devise.rb" beforeDir="false" afterPath="$PROJECT_DIR$/config/initializers/devise.rb" afterDir="false" />
10   - <change beforePath="$PROJECT_DIR$/lib/kanjai/template_generator.rb" beforeDir="false" afterPath="$PROJECT_DIR$/lib/kanjai/template_generator.rb" afterDir="false" />
  7 + <change beforePath="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" beforeDir="false" afterPath="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" afterDir="false" />
  8 + <change beforePath="$PROJECT_DIR$/lib/kanjai/version.rb" beforeDir="false" afterPath="$PROJECT_DIR$/lib/kanjai/version.rb" afterDir="false" />
11 9 </list>
12 10 <ignored path="kanjai.iws" />
13 11 <ignored path=".idea/workspace.xml" />
... ... @@ -27,20 +25,20 @@
27 25 </component>
28 26 <component name="FileEditorManager">
29 27 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
30   - <file leaf-file-name="_content.html.erb" pinned="false" current-in-tab="false">
31   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">
  28 + <file leaf-file-name="page_template.rb" pinned="false" current-in-tab="false">
  29 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
32 30 <provider selected="true" editor-type-id="text-editor">
33   - <state relative-caret-position="15">
34   - <caret line="1" column="121" selection-start-line="1" selection-start-column="121" selection-end-line="1" selection-end-column="121" />
  31 + <state relative-caret-position="1815">
  32 + <caret line="121" column="28" selection-start-line="121" selection-start-column="28" selection-end-line="121" selection-end-column="28" />
35 33 </state>
36 34 </provider>
37 35 </entry>
38 36 </file>
39   - <file leaf-file-name="page_template.rb" pinned="false" current-in-tab="false">
40   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
  37 + <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
  38 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
41 39 <provider selected="true" editor-type-id="text-editor">
42   - <state relative-caret-position="1815">
43   - <caret line="121" column="28" selection-start-line="121" selection-start-column="28" selection-end-line="121" selection-end-column="28" />
  40 + <state relative-caret-position="495">
  41 + <caret line="33" column="34" lean-forward="true" selection-start-line="33" selection-start-column="34" selection-end-line="33" selection-end-column="34" />
44 42 </state>
45 43 </provider>
46 44 </entry>
... ... @@ -83,45 +81,46 @@
83 81 </provider>
84 82 </entry>
85 83 </file>
86   - <file leaf-file-name="version.rb" pinned="false" current-in-tab="false">
  84 + <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
87 85 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
88 86 <provider selected="true" editor-type-id="text-editor">
89 87 <state relative-caret-position="15">
90   - <caret line="1" column="13" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
  88 + <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
91 89 </state>
92 90 </provider>
93 91 </entry>
94 92 </file>
95   - <file leaf-file-name="Gemfile" pinned="false" current-in-tab="false">
96   - <entry file="file://$PROJECT_DIR$/Gemfile">
97   - <provider selected="true" editor-type-id="text-editor" />
98   - </entry>
99   - </file>
100 93 <file leaf-file-name="Gemfile.lock" pinned="false" current-in-tab="false">
101 94 <entry file="file://$PROJECT_DIR$/Gemfile.lock">
102 95 <provider selected="true" editor-type-id="text-editor">
103   - <state relative-caret-position="199">
  96 + <state relative-caret-position="795">
104 97 <caret line="53" column="13" selection-start-line="53" selection-start-column="13" selection-end-line="53" selection-end-column="13" />
105 98 </state>
106 99 </provider>
107 100 </entry>
108 101 </file>
109   - <file leaf-file-name="devise.rb" pinned="false" current-in-tab="true">
  102 + <file leaf-file-name="devise.rb" pinned="false" current-in-tab="false">
110 103 <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
111 104 <provider selected="true" editor-type-id="text-editor">
112   - <state relative-caret-position="166">
  105 + <state relative-caret-position="180">
113 106 <caret line="12" column="3" selection-start-line="12" selection-start-column="3" selection-end-line="12" selection-end-column="3" />
114 107 </state>
115 108 </provider>
116 109 </entry>
117 110 </file>
  111 + <file leaf-file-name="20160707115443_add_show_public_only_to_kanjai_pages.rb" pinned="false" current-in-tab="false">
  112 + <entry file="file://$PROJECT_DIR$/db/migrate/20160707115443_add_show_public_only_to_kanjai_pages.rb">
  113 + <provider selected="true" editor-type-id="text-editor">
  114 + <state relative-caret-position="30">
  115 + <caret line="2" column="73" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="73" />
  116 + </state>
  117 + </provider>
  118 + </entry>
  119 + </file>
118 120 </leaf>
119 121 </component>
120 122 <component name="FindInProjectRecents">
121 123 <findStrings>
122   - <find>@@permissions</find>
123   - <find>c</find>
124   - <find>ce</find>
125 124 <find>che</find>
126 125 <find>check_p</find>
127 126 <find>check_permission</find>
... ... @@ -149,12 +148,15 @@
149 148 <find>def get_marker_type</find>
150 149 <find>sqlite3</find>
151 150 <find>sqli</find>
  151 + <find>show_public_only</find>
  152 + <find>UserSession</find>
  153 + <find>User</find>
152 154 </findStrings>
153 155 <dirStrings>
154 156 <dir>$PROJECT_DIR$/app/controllers</dir>
155 157 <dir>$PROJECT_DIR$/app/assets/javascripts</dir>
156   - <dir>$PROJECT_DIR$/app</dir>
157 158 <dir>$PROJECT_DIR$</dir>
  159 + <dir>$PROJECT_DIR$/app</dir>
158 160 </dirStrings>
159 161 </component>
160 162 <component name="Git.Settings">
... ... @@ -207,13 +209,13 @@
207 209 <option value="$PROJECT_DIR$/kanjai.gemspec" />
208 210 <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
209 211 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js" />
210   - <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
211   - <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
212 212 <option value="$PROJECT_DIR$/app/models/kanjai/page_template.rb" />
213 213 <option value="$PROJECT_DIR$/app/views/kanjai/pages/show.html.erb" />
214 214 <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />
215 215 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb" />
216 216 <option value="$PROJECT_DIR$/config/initializers/devise.rb" />
  217 + <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
  218 + <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
217 219 </list>
218 220 </option>
219 221 </component>
... ... @@ -237,8 +239,6 @@
237 239 <foldersAlwaysOnTop value="true" />
238 240 </navigator>
239 241 <panes>
240   - <pane id="Scope" />
241   - <pane id="RailsProjectView" />
242 242 <pane id="ProjectPane">
243 243 <subPane>
244 244 <expand>
... ... @@ -261,29 +261,18 @@
261 261 <item name="kanjai" type="b2602c69:ProjectViewProjectNode" />
262 262 <item name="kanjai" type="462c0819:PsiDirectoryNode" />
263 263 <item name="app" type="462c0819:PsiDirectoryNode" />
264   - <item name="assets" type="462c0819:PsiDirectoryNode" />
265   - <item name="javascripts" type="462c0819:PsiDirectoryNode" />
  264 + <item name="controllers" type="462c0819:PsiDirectoryNode" />
266 265 </path>
267 266 <path>
268 267 <item name="kanjai" type="b2602c69:ProjectViewProjectNode" />
269 268 <item name="kanjai" type="462c0819:PsiDirectoryNode" />
270 269 <item name="app" type="462c0819:PsiDirectoryNode" />
271   - <item name="assets" type="462c0819:PsiDirectoryNode" />
272   - <item name="javascripts" type="462c0819:PsiDirectoryNode" />
  270 + <item name="controllers" type="462c0819:PsiDirectoryNode" />
273 271 <item name="kanjai" type="462c0819:PsiDirectoryNode" />
274 272 </path>
275 273 <path>
276 274 <item name="kanjai" type="b2602c69:ProjectViewProjectNode" />
277 275 <item name="kanjai" type="462c0819:PsiDirectoryNode" />
278   - <item name="app" type="462c0819:PsiDirectoryNode" />
279   - <item name="assets" type="462c0819:PsiDirectoryNode" />
280   - <item name="javascripts" type="462c0819:PsiDirectoryNode" />
281   - <item name="kanjai" type="462c0819:PsiDirectoryNode" />
282   - <item name="admin" type="462c0819:PsiDirectoryNode" />
283   - </path>
284   - <path>
285   - <item name="kanjai" type="b2602c69:ProjectViewProjectNode" />
286   - <item name="kanjai" type="462c0819:PsiDirectoryNode" />
287 276 <item name="config" type="462c0819:PsiDirectoryNode" />
288 277 </path>
289 278 <path>
... ... @@ -307,6 +296,8 @@
307 296 <select />
308 297 </subPane>
309 298 </pane>
  299 + <pane id="RailsProjectView" />
  300 + <pane id="Scope" />
310 301 </panes>
311 302 </component>
312 303 <component name="PropertiesComponent">
... ... @@ -578,15 +569,18 @@
578 569 <workItem from="1527239274712" duration="965000" />
579 570 <workItem from="1527250151106" duration="1359000" />
580 571 <workItem from="1528795289630" duration="58000" />
581   - <workItem from="1528797772730" duration="1671000" />
  572 + <workItem from="1528797772730" duration="2306000" />
  573 + <workItem from="1528983596909" duration="231000" />
  574 + <workItem from="1528984727408" duration="942000" />
  575 + <workItem from="1529067232509" duration="381000" />
582 576 </task>
583 577 <servers />
584 578 </component>
585 579 <component name="TimeTrackingManager">
586   - <option name="totallyTimeSpent" value="43091000" />
  580 + <option name="totallyTimeSpent" value="45280000" />
587 581 </component>
588 582 <component name="ToolWindowManager">
589   - <frame x="0" y="23" width="1280" height="730" extended-state="6" />
  583 + <frame x="0" y="23" width="1280" height="729" extended-state="6" />
590 584 <editor active="true" />
591 585 <layout>
592 586 <window_info anchor="bottom" id="TODO" order="6" />
... ... @@ -633,10 +627,10 @@
633 627 </breakpoint-manager>
634 628 </component>
635 629 <component name="editorHistoryManager">
636   - <entry file="file://$PROJECT_DIR$/.ruby-version">
  630 + <entry file="file://$PROJECT_DIR$/db/migrate/20160707115443_add_show_public_only_to_kanjai_pages.rb">
637 631 <provider selected="true" editor-type-id="text-editor">
638   - <state>
639   - <caret column="5" lean-forward="true" selection-end-column="5" />
  632 + <state relative-caret-position="30">
  633 + <caret line="2" column="73" lean-forward="true" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="73" />
640 634 </state>
641 635 </provider>
642 636 </entry>
... ... @@ -871,13 +865,6 @@
871 865 </state>
872 866 </provider>
873 867 </entry>
874   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
875   - <provider selected="true" editor-type-id="text-editor">
876   - <state relative-caret-position="1785">
877   - <caret line="119" column="36" selection-start-line="119" selection-start-column="19" selection-end-line="119" selection-end-column="36" />
878   - </state>
879   - </provider>
880   - </entry>
881 868 <entry file="file://$PROJECT_DIR$/config/routes.rb">
882 869 <provider selected="true" editor-type-id="text-editor">
883 870 <state relative-caret-position="855">
... ... @@ -964,27 +951,38 @@
964 951 </state>
965 952 </provider>
966 953 </entry>
967   - <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
  954 + <entry file="file://$PROJECT_DIR$/Gemfile.lock">
968 955 <provider selected="true" editor-type-id="text-editor">
969   - <state relative-caret-position="15">
970   - <caret line="1" column="13" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
  956 + <state relative-caret-position="795">
  957 + <caret line="53" column="13" selection-start-line="53" selection-start-column="13" selection-end-line="53" selection-end-column="13" />
971 958 </state>
972 959 </provider>
973 960 </entry>
974   - <entry file="file://$PROJECT_DIR$/Gemfile">
975   - <provider selected="true" editor-type-id="text-editor" />
  961 + <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
  962 + <provider selected="true" editor-type-id="text-editor">
  963 + <state relative-caret-position="180">
  964 + <caret line="12" column="3" selection-start-line="12" selection-start-column="3" selection-end-line="12" selection-end-column="3" />
  965 + </state>
  966 + </provider>
976 967 </entry>
977   - <entry file="file://$PROJECT_DIR$/Gemfile.lock">
  968 + <entry file="file://$PROJECT_DIR$/db/migrate/20160707115443_add_show_public_only_to_kanjai_pages.rb">
978 969 <provider selected="true" editor-type-id="text-editor">
979   - <state relative-caret-position="199">
980   - <caret line="53" column="13" selection-start-line="53" selection-start-column="13" selection-end-line="53" selection-end-column="13" />
  970 + <state relative-caret-position="30">
  971 + <caret line="2" column="73" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="73" />
981 972 </state>
982 973 </provider>
983 974 </entry>
984   - <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
  975 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
985 976 <provider selected="true" editor-type-id="text-editor">
986   - <state relative-caret-position="166">
987   - <caret line="12" column="3" selection-start-line="12" selection-start-column="3" selection-end-line="12" selection-end-column="3" />
  977 + <state relative-caret-position="495">
  978 + <caret line="33" column="34" lean-forward="true" selection-start-line="33" selection-start-column="34" selection-end-line="33" selection-end-column="34" />
  979 + </state>
  980 + </provider>
  981 + </entry>
  982 + <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
  983 + <provider selected="true" editor-type-id="text-editor">
  984 + <state relative-caret-position="15">
  985 + <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
988 986 </state>
989 987 </provider>
990 988 </entry>
... ...
1 1 PATH
2 2 remote: .
3 3 specs:
4   - kanjai (0.0.79)
  4 + kanjai (0.0.80)
5 5 acts_as_list
6 6 acts_as_tree
7 7 aws-sdk (= 2.6.32)
... ...
... ... @@ -10,7 +10,7 @@ module Kanjai
10 10 #expires_in 10.minutes, :public => true
11 11 if @page_data
12 12 if @page_data.page.private_flag == true
13   - if !!UserSession
  13 + if class_exists?('UserSession')
14 14 unless UserSession.current_user
15 15 render :template => 'kanjai/shared/401', status: 401, layout: false and return
16 16 end
... ... @@ -19,7 +19,7 @@ module Kanjai
19 19 #look - exist template or not for page
20 20 if @page_data.page.page_template
21 21 use_cache = true
22   - if !!UserSession
  22 + if class_exists?('UserSession')
23 23 if UserSession.current_user
24 24 use_cache = false
25 25 end
... ... @@ -27,7 +27,6 @@ module Kanjai
27 27
28 28
29 29 if current_admin_user || @page_data.page.private_flag == true || use_cache == false
30   - p @page_data
31 30 layer = @page_data.page.page_template.get_html_content
32 31 content_for_render = setTemplateContent(@page_data.page.page_template, layer, @page_data)
33 32
... ... @@ -81,6 +80,13 @@ module Kanjai
81 80
82 81 private
83 82
  83 + def class_exists?(class_name)
  84 + klass = Module.const_get(class_name)
  85 + return klass.is_a?(Class)
  86 + rescue NameError
  87 + return false
  88 + end
  89 +
84 90
85 91 def setTemplateContent(page_template, layer, page_data)
86 92
... ... @@ -152,11 +158,11 @@ module Kanjai
152 158 end
153 159 layer.gsub!(marker, content)
154 160 when '###CSRF_PARAM###'
155   - if current_admin_user || (!!UserSession && UserSession.current_user)
  161 + if current_admin_user || (class_exists?('UserSession') && UserSession.current_user)
156 162 layer.gsub!(marker, Rack::Utils.escape_html(request_forgery_protection_token))
157 163 end
158 164 when '###CSRF_TOKEN###'
159   - if current_admin_user || (!!UserSession && UserSession.current_user)
  165 + if current_admin_user || (class_exists?('UserSession') && UserSession.current_user)
160 166 layer.gsub!(marker, Rack::Utils.escape_html(form_authenticity_token))
161 167 end
162 168 when '###DOMAIN_NAME###'
... ... @@ -198,5 +204,6 @@ module Kanjai
198 204
199 205
200 206
  207 +
201 208 end
202 209 end
\ No newline at end of file
... ...
1 1 module Kanjai
2   - VERSION = "0.0.79"
  2 + VERSION = "0.0.81"
3 3 end
... ...