EDIT / kanjai · Commits

Commit abc3ea5f1615aded5be27df99a57cd1186e38aff

Authored by Karpikau Andrei
1 parent 8cd21b99

check private and public page show

Inline Side-by-side
Showing 5 changed files with 29 additions and 28 deletions
@@ -47,8 +47,8 @@ @@ -47,8 +47,8 @@
47 <file leaf-file-name="page.rb" pinned="false" current-in-tab="false"> 47 <file leaf-file-name="page.rb" pinned="false" current-in-tab="false">
48 <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb"> 48 <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.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="791" max-vertical-offset="1425">  
51 - <caret line="64" column="43" selection-start-line="64" selection-start-column="43" selection-end-line="64" selection-end-column="43" /> 50 + <state vertical-scroll-proportion="0.0" vertical-offset="731" max-vertical-offset="1425">
  51 + <caret line="83" column="35" selection-start-line="83" selection-start-column="35" selection-end-line="83" selection-end-column="35" />
52 <folding /> 52 <folding />
53 </state> 53 </state>
54 </provider> 54 </provider>
@@ -78,7 +78,7 @@ @@ -78,7 +78,7 @@
78 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb"> 78 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.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="0" max-vertical-offset="330"> 80 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
81 - <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" /> 81 + <caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
82 <folding /> 82 <folding />
83 </state> 83 </state>
84 </provider> 84 </provider>
@@ -174,10 +174,10 @@ @@ -174,10 +174,10 @@
174 <option value="$PROJECT_DIR$/app/models/kanjai/page_content.rb" /> 174 <option value="$PROJECT_DIR$/app/models/kanjai/page_content.rb" />
175 <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" />
176 <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$/lib/kanjai/template_generator.rb" /> 177 <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />
179 <option value="$PROJECT_DIR$/app/views/kanjai/shared/401.html.erb" /> 178 <option value="$PROJECT_DIR$/app/views/kanjai/shared/401.html.erb" />
180 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" /> 179 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
  180 + <option value="$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb" />
181 <option value="$PROJECT_DIR$/app/models/kanjai/page.rb" /> 181 <option value="$PROJECT_DIR$/app/models/kanjai/page.rb" />
182 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" /> 182 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
183 </list> 183 </list>
@@ -970,14 +970,6 @@ @@ -970,14 +970,6 @@
970 </state> 970 </state>
971 </provider> 971 </provider>
972 </entry> 972 </entry>
973 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">  
974 - <provider selected="true" editor-type-id="text-editor">  
975 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">  
976 - <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />  
977 - <folding />  
978 - </state>  
979 - </provider>  
980 - </entry>  
981 <entry file="file://$PROJECT_DIR$/config/routes.rb"> 973 <entry file="file://$PROJECT_DIR$/config/routes.rb">
982 <provider selected="true" editor-type-id="text-editor"> 974 <provider selected="true" editor-type-id="text-editor">
983 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="900"> 975 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="900">
@@ -994,14 +986,6 @@ @@ -994,14 +986,6 @@
994 </state> 986 </state>
995 </provider> 987 </provider>
996 </entry> 988 </entry>
997 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">  
998 - <provider selected="true" editor-type-id="text-editor">  
999 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="855">  
1000 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
1001 - <folding />  
1002 - </state>  
1003 - </provider>  
1004 - </entry>  
1005 <entry file="file://$PROJECT_DIR$/app/views/kanjai/shared/401.html.erb"> 989 <entry file="file://$PROJECT_DIR$/app/views/kanjai/shared/401.html.erb">
1006 <provider selected="true" editor-type-id="text-editor"> 990 <provider selected="true" editor-type-id="text-editor">
1007 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="610"> 991 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="610">
@@ -1018,10 +1002,26 @@ @@ -1018,10 +1002,26 @@
1018 </state> 1002 </state>
1019 </provider> 1003 </provider>
1020 </entry> 1004 </entry>
  1005 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
  1006 + <provider selected="true" editor-type-id="text-editor">
  1007 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="855">
  1008 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1009 + <folding />
  1010 + </state>
  1011 + </provider>
  1012 + </entry>
1021 <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb"> 1013 <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
1022 <provider selected="true" editor-type-id="text-editor"> 1014 <provider selected="true" editor-type-id="text-editor">
1023 - <state vertical-scroll-proportion="0.0" vertical-offset="791" max-vertical-offset="1425">  
1024 - <caret line="64" column="43" selection-start-line="64" selection-start-column="43" selection-end-line="64" selection-end-column="43" /> 1015 + <state vertical-scroll-proportion="0.0" vertical-offset="731" max-vertical-offset="1425">
  1016 + <caret line="83" column="35" selection-start-line="83" selection-start-column="35" selection-end-line="83" selection-end-column="35" />
  1017 + <folding />
  1018 + </state>
  1019 + </provider>
  1020 + </entry>
  1021 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
  1022 + <provider selected="true" editor-type-id="text-editor">
  1023 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
  1024 + <caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
1025 <folding /> 1025 <folding />
1026 </state> 1026 </state>
1027 </provider> 1027 </provider>
1 PATH 1 PATH
2 remote: . 2 remote: .
3 specs: 3 specs:
4 - kanjai (0.0.16) 4 + kanjai (0.0.17)
5 acts_as_list 5 acts_as_list
6 acts_as_tree 6 acts_as_tree
7 aws-sdk 7 aws-sdk
@@ -70,18 +70,18 @@ module Kanjai @@ -70,18 +70,18 @@ module Kanjai
70 end 70 end
71 end 71 end
72 72
73 - def self.default_public_page_url 73 + def self.default_public_page_url(scheme)
74 page = Page.where(private_flag: false, root_page: true).first 74 page = Page.where(private_flag: false, root_page: true).first
75 if page 75 if page
76 - return page.menu_url($schema) 76 + return page.menu_url(scheme)
77 end 77 end
78 return '/' 78 return '/'
79 end 79 end
80 80
81 - def self.default_private_page_url 81 + def self.default_private_page_url(scheme)
82 page = Page.where(private_flag: true, default_private_page: true).first 82 page = Page.where(private_flag: true, default_private_page: true).first
83 if page 83 if page
84 - return page.menu_url($schema) 84 + return page.menu_url(scheme)
85 end 85 end
86 return '/' 86 return '/'
87 end 87 end
  1 +You don't have access to this is page
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.17" 2 + VERSION = "0.0.18"
3 end 3 end