EDIT / kanjai · Commits

Commit 1fbc07daeb7e44064434c59dcdf0c843fb751ed7

Authored by Karpikau Andrei
1 parent 02ecf78d

check private and public page show

Inline Side-by-side
Showing 8 changed files with 180 additions and 103 deletions
@@ -184,7 +184,7 @@ @@ -184,7 +184,7 @@
184 <orderEntry type="library" scope="PROVIDED" name="rake (v11.1.2, rbenv: 2.1.3) [gem]" level="application" /> 184 <orderEntry type="library" scope="PROVIDED" name="rake (v11.1.2, rbenv: 2.1.3) [gem]" level="application" />
185 <orderEntry type="library" scope="PROVIDED" name="rdoc (v4.2.2, rbenv: 2.1.3) [gem]" level="application" /> 185 <orderEntry type="library" scope="PROVIDED" name="rdoc (v4.2.2, rbenv: 2.1.3) [gem]" level="application" />
186 <orderEntry type="library" scope="PROVIDED" name="ref (v2.0.0, rbenv: 2.1.3) [gem]" level="application" /> 186 <orderEntry type="library" scope="PROVIDED" name="ref (v2.0.0, rbenv: 2.1.3) [gem]" level="application" />
187 - <orderEntry type="library" scope="PROVIDED" name="responders (v2.1.2, rbenv: 2.1.3) [gem]" level="application" /> 187 + <orderEntry type="library" scope="PROVIDED" name="responders (v2.2.0, rbenv: 2.1.3) [gem]" level="application" />
188 <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.4.4, rbenv: 2.1.3) [gem]" level="application" /> 188 <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.4.4, rbenv: 2.1.3) [gem]" level="application" />
189 <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.4.0, rbenv: 2.1.3) [gem]" level="application" /> 189 <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.4.0, rbenv: 2.1.3) [gem]" level="application" />
190 <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.4.1, rbenv: 2.1.3) [gem]" level="application" /> 190 <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.4.1, rbenv: 2.1.3) [gem]" level="application" />
@@ -24,101 +24,101 @@ @@ -24,101 +24,101 @@
24 </component> 24 </component>
25 <component name="FileEditorManager"> 25 <component name="FileEditorManager">
26 <leaf> 26 <leaf>
27 - <file leaf-file-name="install.rake" pinned="false" current-in-tab="false">  
28 - <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake"> 27 + <file leaf-file-name="assets.rb" pinned="false" current-in-tab="false">
  28 + <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb">
29 <provider selected="true" editor-type-id="text-editor"> 29 <provider selected="true" editor-type-id="text-editor">
30 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">  
31 - <caret line="6" column="40" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="40" /> 30 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
  31 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
32 <folding /> 32 <folding />
33 </state> 33 </state>
34 </provider> 34 </provider>
35 </entry> 35 </entry>
36 </file> 36 </file>
37 - <file leaf-file-name="frontend.js" pinned="false" current-in-tab="false">  
38 - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js"> 37 + <file leaf-file-name="engine.rb" pinned="false" current-in-tab="false">
  38 + <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.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="540">  
41 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="24" /> 40 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">
  41 + <caret line="10" column="275" selection-start-line="10" selection-start-column="275" selection-end-line="10" selection-end-column="275" />
42 <folding /> 42 <folding />
43 </state> 43 </state>
44 </provider> 44 </provider>
45 </entry> 45 </entry>
46 </file> 46 </file>
47 - <file leaf-file-name="frontend_not_login.js" pinned="false" current-in-tab="false">  
48 - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_not_login.js"> 47 + <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
  48 + <entry file="file://$PROJECT_DIR$/lib/kanjai/version.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="0" max-vertical-offset="90">  
51 - <caret line="0" column="24" selection-start-line="0" selection-start-column="24" selection-end-line="0" selection-end-column="24" /> 50 + <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
  51 + <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
52 <folding /> 52 <folding />
53 </state> 53 </state>
54 </provider> 54 </provider>
55 </entry> 55 </entry>
56 </file> 56 </file>
57 - <file leaf-file-name="assets.rb" pinned="false" current-in-tab="false">  
58 - <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb"> 57 + <file leaf-file-name="page.rb" pinned="false" current-in-tab="false">
  58 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
59 <provider selected="true" editor-type-id="text-editor"> 59 <provider selected="true" editor-type-id="text-editor">
60 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">  
61 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 60 + <state vertical-scroll-proportion="0.0" vertical-offset="686" max-vertical-offset="1425">
  61 + <caret line="80" column="37" selection-start-line="80" selection-start-column="13" selection-end-line="80" selection-end-column="37" />
62 <folding /> 62 <folding />
63 </state> 63 </state>
64 </provider> 64 </provider>
65 </entry> 65 </entry>
66 </file> 66 </file>
67 - <file leaf-file-name="engine.rb" pinned="false" current-in-tab="false">  
68 - <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb"> 67 + <file leaf-file-name="template_generator.rb" pinned="false" current-in-tab="false">
  68 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
69 <provider selected="true" editor-type-id="text-editor"> 69 <provider selected="true" editor-type-id="text-editor">
70 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">  
71 - <caret line="10" column="275" selection-start-line="10" selection-start-column="275" selection-end-line="10" selection-end-column="275" /> 70 + <state vertical-scroll-proportion="0.0" vertical-offset="885" max-vertical-offset="4005">
  71 + <caret line="90" column="43" selection-start-line="89" selection-start-column="0" selection-end-line="90" selection-end-column="43" />
72 <folding /> 72 <folding />
73 </state> 73 </state>
74 </provider> 74 </provider>
75 </entry> 75 </entry>
76 </file> 76 </file>
77 - <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">  
78 - <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> 77 + <file leaf-file-name="routes.rb" pinned="false" current-in-tab="false">
  78 + <entry file="file://$PROJECT_DIR$/config/routes.rb">
79 <provider selected="true" editor-type-id="text-editor"> 79 <provider selected="true" editor-type-id="text-editor">
80 - <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">  
81 - <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" /> 80 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="900">
  81 + <caret line="9" column="72" selection-start-line="9" selection-start-column="2" selection-end-line="9" selection-end-column="72" />
82 <folding /> 82 <folding />
83 </state> 83 </state>
84 </provider> 84 </provider>
85 </entry> 85 </entry>
86 </file> 86 </file>
87 - <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">  
88 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> 87 + <file leaf-file-name="application_controller.rb" pinned="false" current-in-tab="false">
  88 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
89 <provider selected="true" editor-type-id="text-editor"> 89 <provider selected="true" editor-type-id="text-editor">
90 - <state vertical-scroll-proportion="0.0" vertical-offset="1466" max-vertical-offset="2145">  
91 - <caret line="117" column="0" selection-start-line="117" selection-start-column="0" selection-end-line="117" selection-end-column="0" /> 90 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
  91 + <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
92 <folding /> 92 <folding />
93 </state> 93 </state>
94 </provider> 94 </provider>
95 </entry> 95 </entry>
96 </file> 96 </file>
97 - <file leaf-file-name="aws.rb" pinned="false" current-in-tab="false">  
98 - <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb"> 97 + <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
  98 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
99 <provider selected="true" editor-type-id="text-editor"> 99 <provider selected="true" editor-type-id="text-editor">
100 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180">  
101 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 100 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2160">
  101 + <caret line="29" column="0" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
102 <folding /> 102 <folding />
103 </state> 103 </state>
104 </provider> 104 </provider>
105 </entry> 105 </entry>
106 </file> 106 </file>
107 - <file leaf-file-name="README.rdoc" pinned="false" current-in-tab="false">  
108 - <entry file="file://$PROJECT_DIR$/README.rdoc"> 107 + <file leaf-file-name="401.html.erb" pinned="false" current-in-tab="false">
  108 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/shared/401.html.erb">
109 <provider selected="true" editor-type-id="text-editor"> 109 <provider selected="true" editor-type-id="text-editor">
110 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="120">  
111 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 110 + <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="90">
  111 + <caret line="0" column="37" selection-start-line="0" selection-start-column="37" selection-end-line="0" selection-end-column="37" />
112 <folding /> 112 <folding />
113 </state> 113 </state>
114 </provider> 114 </provider>
115 </entry> 115 </entry>
116 </file> 116 </file>
117 - <file leaf-file-name="page_content.rb" pinned="false" current-in-tab="false">  
118 - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb"> 117 + <file leaf-file-name="site_controller.rb" pinned="false" current-in-tab="false">
  118 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_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="1811" max-vertical-offset="2445">  
121 - <caret line="130" column="0" selection-start-line="130" selection-start-column="0" selection-end-line="130" selection-end-column="0" /> 120 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="855">
  121 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
122 <folding /> 122 <folding />
123 </state> 123 </state>
124 </provider> 124 </provider>
@@ -129,14 +129,10 @@ @@ -129,14 +129,10 @@
129 <component name="IdeDocumentHistory"> 129 <component name="IdeDocumentHistory">
130 <option name="CHANGED_PATHS"> 130 <option name="CHANGED_PATHS">
131 <list> 131 <list>
132 - <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss" />  
133 - <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_site.css.scss" />  
134 - <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_site_editor.css.scss" />  
135 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js" /> 132 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js" />
136 <option value="$PROJECT_DIR$/lib/tasks/install.rake" /> 133 <option value="$PROJECT_DIR$/lib/tasks/install.rake" />
137 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb" /> 134 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb" />
138 <option value="$PROJECT_DIR$/app/models/kanjai/page_template.rb" /> 135 <option value="$PROJECT_DIR$/app/models/kanjai/page_template.rb" />
139 - <option value="$PROJECT_DIR$/app/models/kanjai/page.rb" />  
140 <option value="$PROJECT_DIR$/app/views/kanjai/shared/_new_resource_links.html.erb" /> 136 <option value="$PROJECT_DIR$/app/views/kanjai/shared/_new_resource_links.html.erb" />
141 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/new.html.erb" /> 137 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/new.html.erb" />
142 <option value="$PROJECT_DIR$/app/views/kanjai/shared/_edit_resource_links.html.erb" /> 138 <option value="$PROJECT_DIR$/app/views/kanjai/shared/_edit_resource_links.html.erb" />
@@ -178,6 +174,10 @@ @@ -178,6 +174,10 @@
178 <option value="$PROJECT_DIR$/app/models/kanjai/page_content.rb" /> 174 <option value="$PROJECT_DIR$/app/models/kanjai/page_content.rb" />
179 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_not_login.js" /> 175 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_not_login.js" />
180 <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" /> 176 <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />
  177 + <option value="$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb" />
  178 + <option value="$PROJECT_DIR$/app/models/kanjai/page.rb" />
  179 + <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />
  180 + <option value="$PROJECT_DIR$/app/views/kanjai/shared/401.html.erb" />
181 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" /> 181 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
182 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" /> 182 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
183 </list> 183 </list>
@@ -329,6 +329,54 @@ @@ -329,6 +329,54 @@
329 <option name="myItemId" value="app" /> 329 <option name="myItemId" value="app" />
330 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 330 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
331 </PATH_ELEMENT> 331 </PATH_ELEMENT>
  332 + <PATH_ELEMENT>
  333 + <option name="myItemId" value="views" />
  334 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  335 + </PATH_ELEMENT>
  336 + <PATH_ELEMENT>
  337 + <option name="myItemId" value="kanjai" />
  338 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  339 + </PATH_ELEMENT>
  340 + <PATH_ELEMENT>
  341 + <option name="myItemId" value="shared" />
  342 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  343 + </PATH_ELEMENT>
  344 + </PATH>
  345 + <PATH>
  346 + <PATH_ELEMENT>
  347 + <option name="myItemId" value="kanjai" />
  348 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  349 + </PATH_ELEMENT>
  350 + <PATH_ELEMENT>
  351 + <option name="myItemId" value="kanjai" />
  352 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  353 + </PATH_ELEMENT>
  354 + <PATH_ELEMENT>
  355 + <option name="myItemId" value="app" />
  356 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  357 + </PATH_ELEMENT>
  358 + <PATH_ELEMENT>
  359 + <option name="myItemId" value="views" />
  360 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  361 + </PATH_ELEMENT>
  362 + <PATH_ELEMENT>
  363 + <option name="myItemId" value="kanjai" />
  364 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  365 + </PATH_ELEMENT>
  366 + </PATH>
  367 + <PATH>
  368 + <PATH_ELEMENT>
  369 + <option name="myItemId" value="kanjai" />
  370 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  371 + </PATH_ELEMENT>
  372 + <PATH_ELEMENT>
  373 + <option name="myItemId" value="kanjai" />
  374 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  375 + </PATH_ELEMENT>
  376 + <PATH_ELEMENT>
  377 + <option name="myItemId" value="app" />
  378 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  379 + </PATH_ELEMENT>
332 </PATH> 380 </PATH>
333 <PATH> 381 <PATH>
334 <PATH_ELEMENT> 382 <PATH_ELEMENT>
@@ -559,7 +607,7 @@ @@ -559,7 +607,7 @@
559 <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" /> 607 <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" />
560 <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" /> 608 <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" />
561 <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" /> 609 <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" />
562 - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.27382874" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 610 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.27382874" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
563 <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 611 <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
564 <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" /> 612 <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" />
565 <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" /> 613 <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" />
@@ -596,34 +644,6 @@ @@ -596,34 +644,6 @@
596 <watches-manager /> 644 <watches-manager />
597 </component> 645 </component>
598 <component name="editorHistoryManager"> 646 <component name="editorHistoryManager">
599 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb">  
600 - <provider selected="true" editor-type-id="text-editor">  
601 - <state vertical-scroll-proportion="-3.75" vertical-offset="0" max-vertical-offset="615">  
602 - <caret line="6" column="164" selection-start-line="6" selection-start-column="164" selection-end-line="6" selection-end-column="164" />  
603 - </state>  
604 - </provider>  
605 - </entry>  
606 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/config_controller.rb">  
607 - <provider selected="true" editor-type-id="text-editor">  
608 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="195">  
609 - <caret line="6" column="3" selection-start-line="6" selection-start-column="3" selection-end-line="6" selection-end-column="3" />  
610 - </state>  
611 - </provider>  
612 - </entry>  
613 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/page_contents_controller.rb">  
614 - <provider selected="true" editor-type-id="text-editor">  
615 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="750">  
616 - <caret line="7" column="49" selection-start-line="7" selection-start-column="36" selection-end-line="7" selection-end-column="49" />  
617 - </state>  
618 - </provider>  
619 - </entry>  
620 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/dashboard_controller.rb">  
621 - <provider selected="true" editor-type-id="text-editor">  
622 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="416">  
623 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
624 - </state>  
625 - </provider>  
626 - </entry>  
627 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_langs/index.html.erb"> 647 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_langs/index.html.erb">
628 <provider selected="true" editor-type-id="text-editor"> 648 <provider selected="true" editor-type-id="text-editor">
629 <state vertical-scroll-proportion="-10.708333" vertical-offset="193" max-vertical-offset="585"> 649 <state vertical-scroll-proportion="-10.708333" vertical-offset="193" max-vertical-offset="585">
@@ -708,13 +728,6 @@ @@ -708,13 +728,6 @@
708 </state> 728 </state>
709 </provider> 729 </provider>
710 </entry> 730 </entry>
711 - <entry file="file://$PROJECT_DIR$/config/routes.rb">  
712 - <provider selected="true" editor-type-id="text-editor">  
713 - <state vertical-scroll-proportion="0.0" vertical-offset="180" max-vertical-offset="900">  
714 - <caret line="20" column="61" selection-start-line="20" selection-start-column="61" selection-end-line="20" selection-end-column="61" />  
715 - </state>  
716 - </provider>  
717 - </entry>  
718 <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend/html_editor.css.scss"> 731 <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend/html_editor.css.scss">
719 <provider selected="true" editor-type-id="text-editor"> 732 <provider selected="true" editor-type-id="text-editor">
720 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634"> 733 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
@@ -855,14 +868,6 @@ @@ -855,14 +868,6 @@
855 </state> 868 </state>
856 </provider> 869 </provider>
857 </entry> 870 </entry>
858 - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">  
859 - <provider selected="true" editor-type-id="text-editor">  
860 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1185">  
861 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
862 - <folding />  
863 - </state>  
864 - </provider>  
865 - </entry>  
866 <entry file="file://$PROJECT_DIR$/kanjai.gemspec"> 871 <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
867 <provider selected="true" editor-type-id="text-editor"> 872 <provider selected="true" editor-type-id="text-editor">
868 <state vertical-scroll-proportion="0.0" vertical-offset="465" max-vertical-offset="1140"> 873 <state vertical-scroll-proportion="0.0" vertical-offset="465" max-vertical-offset="1140">
@@ -951,10 +956,58 @@ @@ -951,10 +956,58 @@
951 </state> 956 </state>
952 </provider> 957 </provider>
953 </entry> 958 </entry>
  959 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
  960 + <provider selected="true" editor-type-id="text-editor">
  961 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
  962 + <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
  963 + <folding />
  964 + </state>
  965 + </provider>
  966 + </entry>
  967 + <entry file="file://$PROJECT_DIR$/config/routes.rb">
  968 + <provider selected="true" editor-type-id="text-editor">
  969 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="900">
  970 + <caret line="9" column="72" selection-start-line="9" selection-start-column="2" selection-end-line="9" selection-end-column="72" />
  971 + <folding />
  972 + </state>
  973 + </provider>
  974 + </entry>
  975 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
  976 + <provider selected="true" editor-type-id="text-editor">
  977 + <state vertical-scroll-proportion="0.0" vertical-offset="686" max-vertical-offset="1425">
  978 + <caret line="80" column="37" selection-start-line="80" selection-start-column="13" selection-end-line="80" selection-end-column="37" />
  979 + <folding />
  980 + </state>
  981 + </provider>
  982 + </entry>
  983 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
  984 + <provider selected="true" editor-type-id="text-editor">
  985 + <state vertical-scroll-proportion="0.0" vertical-offset="885" max-vertical-offset="4005">
  986 + <caret line="90" column="43" selection-start-line="89" selection-start-column="0" selection-end-line="90" selection-end-column="43" />
  987 + <folding />
  988 + </state>
  989 + </provider>
  990 + </entry>
  991 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
  992 + <provider selected="true" editor-type-id="text-editor">
  993 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="855">
  994 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  995 + <folding />
  996 + </state>
  997 + </provider>
  998 + </entry>
  999 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/shared/401.html.erb">
  1000 + <provider selected="true" editor-type-id="text-editor">
  1001 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="610">
  1002 + <caret line="0" column="37" selection-start-line="0" selection-start-column="37" selection-end-line="0" selection-end-column="37" />
  1003 + <folding />
  1004 + </state>
  1005 + </provider>
  1006 + </entry>
954 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> 1007 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
955 <provider selected="true" editor-type-id="text-editor"> 1008 <provider selected="true" editor-type-id="text-editor">
956 - <state vertical-scroll-proportion="0.0" vertical-offset="1466" max-vertical-offset="2145">  
957 - <caret line="117" column="0" selection-start-line="117" selection-start-column="0" selection-end-line="117" selection-end-column="0" /> 1009 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2160">
  1010 + <caret line="29" column="0" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
958 <folding /> 1011 <folding />
959 </state> 1012 </state>
960 </provider> 1013 </provider>
1 PATH 1 PATH
2 remote: . 2 remote: .
3 specs: 3 specs:
4 - kanjai (0.0.14) 4 + kanjai (0.0.15)
5 acts_as_list 5 acts_as_list
6 acts_as_tree 6 acts_as_tree
7 aws-sdk 7 aws-sdk
@@ -159,7 +159,7 @@ GEM @@ -159,7 +159,7 @@ GEM
159 rdoc (4.2.2) 159 rdoc (4.2.2)
160 json (~> 1.4) 160 json (~> 1.4)
161 ref (2.0.0) 161 ref (2.0.0)
162 - responders (2.1.2) 162 + responders (2.2.0)
163 railties (>= 4.2.0, < 5.1) 163 railties (>= 4.2.0, < 5.1)
164 rspec-core (3.4.4) 164 rspec-core (3.4.4)
165 rspec-support (~> 3.4.0) 165 rspec-support (~> 3.4.0)
1 module Kanjai 1 module Kanjai
2 - class ApplicationController < ActionController::Base 2 + class ApplicationController < ::ApplicationController#ActionController::Base
3 before_filter :instantiate_controller_and_action_names 3 before_filter :instantiate_controller_and_action_names
4 4
5 def instantiate_controller_and_action_names 5 def instantiate_controller_and_action_names
@@ -6,13 +6,14 @@ module Kanjai @@ -6,13 +6,14 @@ module Kanjai
6 6
7 def show 7 def show
8 8
9 -=begin  
10 - str = Client::SessionsController.render :new  
11 -  
12 - render :text => str and return  
13 -=end  
14 -  
15 if @page_data 9 if @page_data
  10 + if @page_data.page.private_flag == true
  11 + if !!UserSession
  12 + unless UserSession.current_user
  13 + render :template => 'kanjai/shared/401', status: 401, layout: false and return
  14 + end
  15 + end
  16 + end
16 #look - exist template or not for page 17 #look - exist template or not for page
17 if @page_data.page.page_template 18 if @page_data.page.page_template
18 #get page content 19 #get page content
@@ -29,7 +30,7 @@ module Kanjai @@ -29,7 +30,7 @@ module Kanjai
29 30
30 31
31 else 32 else
32 - render :template => 'shared/404', status: 404, layout: false 33 + render :template => 'kanjai/shared/404', status: 404, layout: false
33 end 34 end
34 end 35 end
35 36
@@ -70,5 +70,21 @@ module Kanjai @@ -70,5 +70,21 @@ module Kanjai
70 end 70 end
71 end 71 end
72 72
  73 + def self.default_public_page_url
  74 + page = Page.where(private_flag: false, root_page: true).first
  75 + if page
  76 + return page.lang_attributes(I18n.locale, 'url')
  77 + end
  78 + return '/'
  79 + end
  80 +
  81 + def self.default_private_page_url
  82 + page = Page.where(private_flag: true, default_private_page: true).first
  83 + if page
  84 + return page.lang_attributes(I18n.locale, 'url')
  85 + end
  86 + return '/'
  87 + end
  88 +
73 end 89 end
74 end 90 end
@@ -25,7 +25,6 @@ module Kanjai @@ -25,7 +25,6 @@ module Kanjai
25 25
26 26
27 def self.menu_generator(elements, subparts, hash_value, current_page = nil) 27 def self.menu_generator(elements, subparts, hash_value, current_page = nil)
28 -  
29 elements.each do |item| 28 elements.each do |item|
30 case item[:name] 29 case item[:name]
31 when 'text' 30 when 'text'
@@ -88,6 +87,14 @@ module Kanjai @@ -88,6 +87,14 @@ module Kanjai
88 page_collection = page_collection.where(:parent_id => current_page.id) 87 page_collection = page_collection.where(:parent_id => current_page.id)
89 end 88 end
90 89
  90 + if !!UserSession
  91 + if UserSession.current_user
  92 + page_collection = page_collection.where(private_flag: true)
  93 + else
  94 + page_collection = page_collection.where(private_flag: false)
  95 + end
  96 + end
  97 +
91 98
92 page_collection.each do |page| 99 page_collection.each do |page|
93 if page.children.length > 0 and next_level 100 if page.children.length > 0 and next_level
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.15" 2 + VERSION = "0.0.16"
3 end 3 end