Commit 8cd21b99eb8beb387df17872f88bed6a9c628c91
1 parent
1fbc07da
check private and public page show
Showing
4 changed files
with
55 additions
and
33 deletions
| @@ -24,16 +24,6 @@ | @@ -24,16 +24,6 @@ | ||
| 24 | </component> | 24 | </component> |
| 25 | <component name="FileEditorManager"> | 25 | <component name="FileEditorManager"> |
| 26 | <leaf> | 26 | <leaf> |
| 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"> | ||
| 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 /> | ||
| 33 | - </state> | ||
| 34 | - </provider> | ||
| 35 | - </entry> | ||
| 36 | - </file> | ||
| 37 | <file leaf-file-name="engine.rb" pinned="false" current-in-tab="false"> | 27 | <file leaf-file-name="engine.rb" pinned="false" current-in-tab="false"> |
| 38 | <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb"> | 28 | <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb"> |
| 39 | <provider selected="true" editor-type-id="text-editor"> | 29 | <provider selected="true" editor-type-id="text-editor"> |
| @@ -57,8 +47,8 @@ | @@ -57,8 +47,8 @@ | ||
| 57 | <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"> |
| 58 | <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb"> | 48 | <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb"> |
| 59 | <provider selected="true" editor-type-id="text-editor"> | 49 | <provider selected="true" editor-type-id="text-editor"> |
| 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" /> | 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" /> | ||
| 62 | <folding /> | 52 | <folding /> |
| 63 | </state> | 53 | </state> |
| 64 | </provider> | 54 | </provider> |
| @@ -94,6 +84,16 @@ | @@ -94,6 +84,16 @@ | ||
| 94 | </provider> | 84 | </provider> |
| 95 | </entry> | 85 | </entry> |
| 96 | </file> | 86 | </file> |
| 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"> | ||
| 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 /> | ||
| 93 | + </state> | ||
| 94 | + </provider> | ||
| 95 | + </entry> | ||
| 96 | + </file> | ||
| 97 | <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false"> | 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"> | 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"> |
| @@ -175,10 +175,10 @@ | @@ -175,10 +175,10 @@ | ||
| 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" /> | 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" /> | 178 | <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" /> |
| 180 | <option value="$PROJECT_DIR$/app/views/kanjai/shared/401.html.erb" /> | 179 | <option value="$PROJECT_DIR$/app/views/kanjai/shared/401.html.erb" /> |
| 181 | <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" /> | 180 | <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.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> |
| 184 | </option> | 184 | </option> |
| @@ -377,6 +377,28 @@ | @@ -377,6 +377,28 @@ | ||
| 377 | <option name="myItemId" value="app" /> | 377 | <option name="myItemId" value="app" /> |
| 378 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | 378 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 379 | </PATH_ELEMENT> | 379 | </PATH_ELEMENT> |
| 380 | + <PATH_ELEMENT> | ||
| 381 | + <option name="myItemId" value="models" /> | ||
| 382 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
| 383 | + </PATH_ELEMENT> | ||
| 384 | + <PATH_ELEMENT> | ||
| 385 | + <option name="myItemId" value="kanjai" /> | ||
| 386 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
| 387 | + </PATH_ELEMENT> | ||
| 388 | + </PATH> | ||
| 389 | + <PATH> | ||
| 390 | + <PATH_ELEMENT> | ||
| 391 | + <option name="myItemId" value="kanjai" /> | ||
| 392 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
| 393 | + </PATH_ELEMENT> | ||
| 394 | + <PATH_ELEMENT> | ||
| 395 | + <option name="myItemId" value="kanjai" /> | ||
| 396 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
| 397 | + </PATH_ELEMENT> | ||
| 398 | + <PATH_ELEMENT> | ||
| 399 | + <option name="myItemId" value="app" /> | ||
| 400 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
| 401 | + </PATH_ELEMENT> | ||
| 380 | </PATH> | 402 | </PATH> |
| 381 | <PATH> | 403 | <PATH> |
| 382 | <PATH_ELEMENT> | 404 | <PATH_ELEMENT> |
| @@ -876,14 +898,6 @@ | @@ -876,14 +898,6 @@ | ||
| 876 | </state> | 898 | </state> |
| 877 | </provider> | 899 | </provider> |
| 878 | </entry> | 900 | </entry> |
| 879 | - <entry file="file://$PROJECT_DIR$/Gemfile"> | ||
| 880 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 881 | - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255"> | ||
| 882 | - <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" /> | ||
| 883 | - <folding /> | ||
| 884 | - </state> | ||
| 885 | - </provider> | ||
| 886 | - </entry> | ||
| 887 | <entry file="file://$PROJECT_DIR$/lib/kanjai.rb"> | 901 | <entry file="file://$PROJECT_DIR$/lib/kanjai.rb"> |
| 888 | <provider selected="true" editor-type-id="text-editor"> | 902 | <provider selected="true" editor-type-id="text-editor"> |
| 889 | <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255"> | 903 | <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255"> |
| @@ -972,14 +986,6 @@ | @@ -972,14 +986,6 @@ | ||
| 972 | </state> | 986 | </state> |
| 973 | </provider> | 987 | </provider> |
| 974 | </entry> | 988 | </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"> | 989 | <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb"> |
| 984 | <provider selected="true" editor-type-id="text-editor"> | 990 | <provider selected="true" editor-type-id="text-editor"> |
| 985 | <state vertical-scroll-proportion="0.0" vertical-offset="885" max-vertical-offset="4005"> | 991 | <state vertical-scroll-proportion="0.0" vertical-offset="885" max-vertical-offset="4005"> |
| @@ -1012,6 +1018,22 @@ | @@ -1012,6 +1018,22 @@ | ||
| 1012 | </state> | 1018 | </state> |
| 1013 | </provider> | 1019 | </provider> |
| 1014 | </entry> | 1020 | </entry> |
| 1021 | + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb"> | ||
| 1022 | + <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" /> | ||
| 1025 | + <folding /> | ||
| 1026 | + </state> | ||
| 1027 | + </provider> | ||
| 1028 | + </entry> | ||
| 1029 | + <entry file="file://$PROJECT_DIR$/Gemfile"> | ||
| 1030 | + <provider selected="true" editor-type-id="text-editor"> | ||
| 1031 | + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255"> | ||
| 1032 | + <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" /> | ||
| 1033 | + <folding /> | ||
| 1034 | + </state> | ||
| 1035 | + </provider> | ||
| 1036 | + </entry> | ||
| 1015 | <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> | 1037 | <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> |
| 1016 | <provider selected="true" editor-type-id="text-editor"> | 1038 | <provider selected="true" editor-type-id="text-editor"> |
| 1017 | <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634"> | 1039 | <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634"> |
| @@ -73,7 +73,7 @@ module Kanjai | @@ -73,7 +73,7 @@ module Kanjai | ||
| 73 | def self.default_public_page_url | 73 | def self.default_public_page_url |
| 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.lang_attributes(I18n.locale, 'url') | 76 | + return page.menu_url($schema) |
| 77 | end | 77 | end |
| 78 | return '/' | 78 | return '/' |
| 79 | end | 79 | end |
| @@ -81,7 +81,7 @@ module Kanjai | @@ -81,7 +81,7 @@ module Kanjai | ||
| 81 | def self.default_private_page_url | 81 | def self.default_private_page_url |
| 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.lang_attributes(I18n.locale, 'url') | 84 | + return page.menu_url($schema) |
| 85 | end | 85 | end |
| 86 | return '/' | 86 | return '/' |
| 87 | end | 87 | end |