EDIT / kanjai · Commits

Commit e7244671acaaebb03573ec8cc83d13845246cb60

Authored by Karpikau Andrei
1 parent 5dbcc8d0

check private page

Inline Side-by-side
Showing 4 changed files with 82 additions and 52 deletions
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake"> 28 <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
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"> 30 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
31 - <caret line="15" column="33" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" /> 31 + <caret line="8" column="5" selection-start-line="8" selection-start-column="5" selection-end-line="8" selection-end-column="5" />
32 <folding /> 32 <folding />
33 </state> 33 </state>
34 </provider> 34 </provider>
@@ -64,11 +64,11 @@ @@ -64,11 +64,11 @@
64 </provider> 64 </provider>
65 </entry> 65 </entry>
66 </file> 66 </file>
67 - <file leaf-file-name="page.rb" pinned="false" current-in-tab="false">  
68 - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb"> 67 + <file leaf-file-name="frontend.js" pinned="false" current-in-tab="false">
  68 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
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="266" max-vertical-offset="1425">  
71 - <caret line="83" column="35" selection-start-line="83" selection-start-column="35" selection-end-line="83" selection-end-column="35" /> 70 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="540">
  71 + <caret line="18" column="30" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
72 <folding /> 72 <folding />
73 </state> 73 </state>
74 </provider> 74 </provider>
@@ -77,28 +77,28 @@ @@ -77,28 +77,28 @@
77 <file leaf-file-name="template_generator.rb" pinned="false" current-in-tab="false"> 77 <file leaf-file-name="template_generator.rb" pinned="false" current-in-tab="false">
78 <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb"> 78 <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.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.0" vertical-offset="2187" max-vertical-offset="4005">  
81 - <caret line="155" column="63" selection-start-line="155" selection-start-column="63" selection-end-line="155" selection-end-column="63" /> 80 + <state vertical-scroll-proportion="0.0" vertical-offset="1092" max-vertical-offset="4065">
  81 + <caret line="99" column="17" selection-start-line="99" selection-start-column="17" selection-end-line="99" selection-end-column="17" />
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="application_controller.rb" pinned="false" current-in-tab="false">  
88 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb"> 87 + <file leaf-file-name="Gemfile" pinned="false" current-in-tab="false">
  88 + <entry file="file://$PROJECT_DIR$/Gemfile">
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="0" max-vertical-offset="330">  
91 - <caret line="12" column="13" selection-start-line="12" selection-start-column="6" selection-end-line="12" selection-end-column="13" /> 90 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
  91 + <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
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="routes.rb" pinned="false" current-in-tab="false">  
98 - <entry file="file://$PROJECT_DIR$/config/routes.rb"> 97 + <file leaf-file-name="application_controller.rb" pinned="false" current-in-tab="false">
  98 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_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="266" max-vertical-offset="900">  
101 - <caret line="9" column="72" selection-start-line="9" selection-start-column="2" selection-end-line="9" selection-end-column="72" /> 100 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
  101 + <caret line="12" column="13" selection-start-line="12" selection-start-column="6" selection-end-line="12" selection-end-column="13" />
102 <folding /> 102 <folding />
103 </state> 103 </state>
104 </provider> 104 </provider>
@@ -175,10 +175,10 @@ @@ -175,10 +175,10 @@
175 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" /> 175 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
176 <option value="$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb" /> 176 <option value="$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb" />
177 <option value="$PROJECT_DIR$/app/models/kanjai/page.rb" /> 177 <option value="$PROJECT_DIR$/app/models/kanjai/page.rb" />
178 - <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />  
179 <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" /> 178 <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
180 <option value="$PROJECT_DIR$/lib/tasks/install.rake" /> 179 <option value="$PROJECT_DIR$/lib/tasks/install.rake" />
181 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss" /> 180 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss" />
  181 + <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />
182 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" /> 182 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
183 </list> 183 </list>
184 </option> 184 </option>
@@ -355,6 +355,32 @@ @@ -355,6 +355,32 @@
355 <option name="myItemId" value="assets" /> 355 <option name="myItemId" value="assets" />
356 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 356 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
357 </PATH_ELEMENT> 357 </PATH_ELEMENT>
  358 + <PATH_ELEMENT>
  359 + <option name="myItemId" value="javascripts" />
  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>
  380 + <PATH_ELEMENT>
  381 + <option name="myItemId" value="assets" />
  382 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  383 + </PATH_ELEMENT>
358 </PATH> 384 </PATH>
359 </subPane> 385 </subPane>
360 </pane> 386 </pane>
@@ -832,14 +858,6 @@ @@ -832,14 +858,6 @@
832 </state> 858 </state>
833 </provider> 859 </provider>
834 </entry> 860 </entry>
835 - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">  
836 - <provider selected="true" editor-type-id="text-editor">  
837 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="540">  
838 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="24" />  
839 - <folding />  
840 - </state>  
841 - </provider>  
842 - </entry>  
843 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_not_login.js"> 861 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_not_login.js">
844 <provider selected="true" editor-type-id="text-editor"> 862 <provider selected="true" editor-type-id="text-editor">
845 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634"> 863 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
@@ -872,14 +890,6 @@ @@ -872,14 +890,6 @@
872 </state> 890 </state>
873 </provider> 891 </provider>
874 </entry> 892 </entry>
875 - <entry file="file://$PROJECT_DIR$/Gemfile">  
876 - <provider selected="true" editor-type-id="text-editor">  
877 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">  
878 - <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />  
879 - <folding />  
880 - </state>  
881 - </provider>  
882 - </entry>  
883 <entry file="file://$PROJECT_DIR$/config/routes.rb"> 893 <entry file="file://$PROJECT_DIR$/config/routes.rb">
884 <provider selected="true" editor-type-id="text-editor"> 894 <provider selected="true" editor-type-id="text-editor">
885 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="900"> 895 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="900">
@@ -912,18 +922,34 @@ @@ -912,18 +922,34 @@
912 </state> 922 </state>
913 </provider> 923 </provider>
914 </entry> 924 </entry>
915 - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb"> 925 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
916 <provider selected="true" editor-type-id="text-editor"> 926 <provider selected="true" editor-type-id="text-editor">
917 - <state vertical-scroll-proportion="0.0" vertical-offset="2187" max-vertical-offset="4005">  
918 - <caret line="155" column="63" selection-start-line="155" selection-start-column="63" selection-end-line="155" selection-end-column="63" /> 927 + <state vertical-scroll-proportion="0.0" vertical-offset="251" max-vertical-offset="885">
  928 + <caret line="48" column="7" selection-start-line="48" selection-start-column="7" selection-end-line="48" selection-end-column="7" />
919 <folding /> 929 <folding />
920 </state> 930 </state>
921 </provider> 931 </provider>
922 </entry> 932 </entry>
923 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb"> 933 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/bootstrap.css.scss.erb">
924 <provider selected="true" editor-type-id="text-editor"> 934 <provider selected="true" editor-type-id="text-editor">
925 - <state vertical-scroll-proportion="0.0" vertical-offset="251" max-vertical-offset="885">  
926 - <caret line="48" column="7" selection-start-line="48" selection-start-column="7" selection-end-line="48" selection-end-column="7" /> 935 + <state vertical-scroll-proportion="-8.875" vertical-offset="3822" max-vertical-offset="95070">
  936 + <caret line="269" column="26" selection-start-line="269" selection-start-column="16" selection-end-line="269" selection-end-column="26" />
  937 + <folding />
  938 + </state>
  939 + </provider>
  940 + </entry>
  941 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss">
  942 + <provider selected="true" editor-type-id="text-editor">
  943 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="610">
  944 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  945 + <folding />
  946 + </state>
  947 + </provider>
  948 + </entry>
  949 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
  950 + <provider selected="true" editor-type-id="text-editor">
  951 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="540">
  952 + <caret line="18" column="30" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
927 <folding /> 953 <folding />
928 </state> 954 </state>
929 </provider> 955 </provider>
@@ -931,23 +957,23 @@ @@ -931,23 +957,23 @@
931 <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake"> 957 <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
932 <provider selected="true" editor-type-id="text-editor"> 958 <provider selected="true" editor-type-id="text-editor">
933 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390"> 959 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
934 - <caret line="15" column="33" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" /> 960 + <caret line="8" column="5" selection-start-line="8" selection-start-column="5" selection-end-line="8" selection-end-column="5" />
935 <folding /> 961 <folding />
936 </state> 962 </state>
937 </provider> 963 </provider>
938 </entry> 964 </entry>
939 - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/bootstrap.css.scss.erb"> 965 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
940 <provider selected="true" editor-type-id="text-editor"> 966 <provider selected="true" editor-type-id="text-editor">
941 - <state vertical-scroll-proportion="-8.875" vertical-offset="3822" max-vertical-offset="95070">  
942 - <caret line="269" column="26" selection-start-line="269" selection-start-column="16" selection-end-line="269" selection-end-column="26" /> 967 + <state vertical-scroll-proportion="0.0" vertical-offset="1092" max-vertical-offset="4065">
  968 + <caret line="99" column="17" selection-start-line="99" selection-start-column="17" selection-end-line="99" selection-end-column="17" />
943 <folding /> 969 <folding />
944 </state> 970 </state>
945 </provider> 971 </provider>
946 </entry> 972 </entry>
947 - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss"> 973 + <entry file="file://$PROJECT_DIR$/Gemfile">
948 <provider selected="true" editor-type-id="text-editor"> 974 <provider selected="true" editor-type-id="text-editor">
949 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="610">  
950 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 975 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
  976 + <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
951 <folding /> 977 <folding />
952 </state> 978 </state>
953 </provider> 979 </provider>
1 PATH 1 PATH
2 remote: . 2 remote: .
3 specs: 3 specs:
4 - kanjai (0.0.19) 4 + kanjai (0.0.20)
5 acts_as_list 5 acts_as_list
6 acts_as_tree 6 acts_as_tree
7 aws-sdk 7 aws-sdk
@@ -87,12 +87,16 @@ module Kanjai @@ -87,12 +87,16 @@ module Kanjai
87 page_collection = page_collection.where(:parent_id => current_page.id) 87 page_collection = page_collection.where(:parent_id => current_page.id)
88 end 88 end
89 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) 90 + begin
  91 + if !!UserSession
  92 + if UserSession.current_user
  93 + page_collection = page_collection.where(private_flag: true)
  94 + else
  95 + page_collection = page_collection.where(private_flag: false)
  96 + end
95 end 97 end
  98 + rescue
  99 + page_collection = page_collection.where(private_flag: false)
96 end 100 end
97 101
98 102
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.20" 2 + VERSION = "0.0.21"
3 end 3 end