Showing
5 changed files
with
18 additions
and
18 deletions
| @@ -136,9 +136,9 @@ | @@ -136,9 +136,9 @@ | ||
| 136 | <orderEntry type="library" scope="PROVIDED" name="acts_as_list (v0.7.4, rbenv: 2.1.3) [gem]" level="application" /> | 136 | <orderEntry type="library" scope="PROVIDED" name="acts_as_list (v0.7.4, rbenv: 2.1.3) [gem]" level="application" /> |
| 137 | <orderEntry type="library" scope="PROVIDED" name="acts_as_tree (v2.4.0, rbenv: 2.1.3) [gem]" level="application" /> | 137 | <orderEntry type="library" scope="PROVIDED" name="acts_as_tree (v2.4.0, rbenv: 2.1.3) [gem]" level="application" /> |
| 138 | <orderEntry type="library" scope="PROVIDED" name="arel (v6.0.3, rbenv: 2.1.3) [gem]" level="application" /> | 138 | <orderEntry type="library" scope="PROVIDED" name="arel (v6.0.3, rbenv: 2.1.3) [gem]" level="application" /> |
| 139 | - <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v2.3.0, rbenv: 2.1.3) [gem]" level="application" /> | ||
| 140 | - <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.3.0, rbenv: 2.1.3) [gem]" level="application" /> | ||
| 141 | - <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.3.0, rbenv: 2.1.3) [gem]" level="application" /> | 139 | + <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v2.3.1, rbenv: 2.1.3) [gem]" level="application" /> |
| 140 | + <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.3.1, rbenv: 2.1.3) [gem]" level="application" /> | ||
| 141 | + <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.3.1, rbenv: 2.1.3) [gem]" level="application" /> | ||
| 142 | <orderEntry type="library" scope="PROVIDED" name="backport_new_renderer (v1.0.0, rbenv: 2.1.3) [gem]" level="application" /> | 142 | <orderEntry type="library" scope="PROVIDED" name="backport_new_renderer (v1.0.0, rbenv: 2.1.3) [gem]" level="application" /> |
| 143 | <orderEntry type="library" scope="PROVIDED" name="bcrypt (v3.1.11, rbenv: 2.1.3) [gem]" level="application" /> | 143 | <orderEntry type="library" scope="PROVIDED" name="bcrypt (v3.1.11, rbenv: 2.1.3) [gem]" level="application" /> |
| 144 | <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.2, rbenv: 2.1.3) [gem]" level="application" /> | 144 | <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.2, rbenv: 2.1.3) [gem]" level="application" /> |
| @@ -147,7 +147,7 @@ | @@ -147,7 +147,7 @@ | ||
| 147 | <orderEntry type="library" scope="PROVIDED" name="daemons (v1.2.3, rbenv: 2.1.3) [gem]" level="application" /> | 147 | <orderEntry type="library" scope="PROVIDED" name="daemons (v1.2.3, rbenv: 2.1.3) [gem]" level="application" /> |
| 148 | <orderEntry type="library" scope="PROVIDED" name="delayed_job (v4.1.1, rbenv: 2.1.3) [gem]" level="application" /> | 148 | <orderEntry type="library" scope="PROVIDED" name="delayed_job (v4.1.1, rbenv: 2.1.3) [gem]" level="application" /> |
| 149 | <orderEntry type="library" scope="PROVIDED" name="delayed_job_active_record (v4.1.0, rbenv: 2.1.3) [gem]" level="application" /> | 149 | <orderEntry type="library" scope="PROVIDED" name="delayed_job_active_record (v4.1.0, rbenv: 2.1.3) [gem]" level="application" /> |
| 150 | - <orderEntry type="library" scope="PROVIDED" name="devise (v4.0.1, rbenv: 2.1.3) [gem]" level="application" /> | 150 | + <orderEntry type="library" scope="PROVIDED" name="devise (v4.1.0, rbenv: 2.1.3) [gem]" level="application" /> |
| 151 | <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.5, rbenv: 2.1.3) [gem]" level="application" /> | 151 | <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.5, rbenv: 2.1.3) [gem]" level="application" /> |
| 152 | <orderEntry type="library" scope="PROVIDED" name="erubis (v2.7.0, rbenv: 2.1.3) [gem]" level="application" /> | 152 | <orderEntry type="library" scope="PROVIDED" name="erubis (v2.7.0, rbenv: 2.1.3) [gem]" level="application" /> |
| 153 | <orderEntry type="library" scope="PROVIDED" name="execjs (v2.6.0, rbenv: 2.1.3) [gem]" level="application" /> | 153 | <orderEntry type="library" scope="PROVIDED" name="execjs (v2.6.0, rbenv: 2.1.3) [gem]" level="application" /> |
| @@ -167,7 +167,7 @@ | @@ -167,7 +167,7 @@ | ||
| 167 | <orderEntry type="library" scope="PROVIDED" name="mime-types-data (v3.2016.0221, rbenv: 2.1.3) [gem]" level="application" /> | 167 | <orderEntry type="library" scope="PROVIDED" name="mime-types-data (v3.2016.0221, rbenv: 2.1.3) [gem]" level="application" /> |
| 168 | <orderEntry type="library" scope="PROVIDED" name="mini_portile (v0.5.3, rbenv: 2.1.3) [gem]" level="application" /> | 168 | <orderEntry type="library" scope="PROVIDED" name="mini_portile (v0.5.3, rbenv: 2.1.3) [gem]" level="application" /> |
| 169 | <orderEntry type="library" scope="PROVIDED" name="minitest (v5.8.4, rbenv: 2.1.3) [gem]" level="application" /> | 169 | <orderEntry type="library" scope="PROVIDED" name="minitest (v5.8.4, rbenv: 2.1.3) [gem]" level="application" /> |
| 170 | - <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.11.3, rbenv: 2.1.3) [gem]" level="application" /> | 170 | + <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.12.0, rbenv: 2.1.3) [gem]" level="application" /> |
| 171 | <orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.6.1, rbenv: 2.1.3) [gem]" level="application" /> | 171 | <orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.6.1, rbenv: 2.1.3) [gem]" level="application" /> |
| 172 | <orderEntry type="library" scope="PROVIDED" name="orm_adapter (v0.5.0, rbenv: 2.1.3) [gem]" level="application" /> | 172 | <orderEntry type="library" scope="PROVIDED" name="orm_adapter (v0.5.0, rbenv: 2.1.3) [gem]" level="application" /> |
| 173 | <orderEntry type="library" scope="PROVIDED" name="pg (v0.17.1, rbenv: 2.1.3) [gem]" level="application" /> | 173 | <orderEntry type="library" scope="PROVIDED" name="pg (v0.17.1, rbenv: 2.1.3) [gem]" level="application" /> |
| @@ -48,7 +48,7 @@ | @@ -48,7 +48,7 @@ | ||
| 48 | <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> | 48 | <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.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="89" max-vertical-offset="2160"> | 50 | <state vertical-scroll-proportion="0.0" vertical-offset="89" max-vertical-offset="2160"> |
| 51 | - <caret line="32" column="86" selection-start-line="32" selection-start-column="86" selection-end-line="32" selection-end-column="86" /> | 51 | + <caret line="18" column="44" selection-start-line="18" selection-start-column="44" selection-end-line="18" selection-end-column="44" /> |
| 52 | <folding /> | 52 | <folding /> |
| 53 | </state> | 53 | </state> |
| 54 | </provider> | 54 | </provider> |
| @@ -564,7 +564,7 @@ | @@ -564,7 +564,7 @@ | ||
| 564 | <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" /> | 564 | <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" /> |
| 565 | <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" /> | 565 | <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" /> |
| 566 | <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" /> | 566 | <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" /> |
| 567 | - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.27786753" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> | 567 | + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.27786753" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> |
| 568 | <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" /> | 568 | <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" /> |
| 569 | <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> | 569 | <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> |
| 570 | <window_info id="Version Control" 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" /> | 570 | <window_info id="Version Control" 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" /> |
| @@ -961,7 +961,7 @@ | @@ -961,7 +961,7 @@ | ||
| 961 | <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> | 961 | <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> |
| 962 | <provider selected="true" editor-type-id="text-editor"> | 962 | <provider selected="true" editor-type-id="text-editor"> |
| 963 | <state vertical-scroll-proportion="0.0" vertical-offset="89" max-vertical-offset="2160"> | 963 | <state vertical-scroll-proportion="0.0" vertical-offset="89" max-vertical-offset="2160"> |
| 964 | - <caret line="32" column="86" selection-start-line="32" selection-start-column="86" selection-end-line="32" selection-end-column="86" /> | 964 | + <caret line="18" column="44" selection-start-line="18" selection-start-column="44" selection-end-line="18" selection-end-column="44" /> |
| 965 | <folding /> | 965 | <folding /> |
| 966 | </state> | 966 | </state> |
| 967 | </provider> | 967 | </provider> |
| 1 | PATH | 1 | PATH |
| 2 | remote: . | 2 | remote: . |
| 3 | specs: | 3 | specs: |
| 4 | - kanjai (0.0.25) | 4 | + kanjai (0.0.26) |
| 5 | acts_as_list | 5 | acts_as_list |
| 6 | acts_as_tree | 6 | acts_as_tree |
| 7 | aws-sdk | 7 | aws-sdk |
| @@ -64,12 +64,12 @@ GEM | @@ -64,12 +64,12 @@ GEM | ||
| 64 | acts_as_tree (2.4.0) | 64 | acts_as_tree (2.4.0) |
| 65 | activerecord (>= 3.0.0) | 65 | activerecord (>= 3.0.0) |
| 66 | arel (6.0.3) | 66 | arel (6.0.3) |
| 67 | - aws-sdk (2.3.0) | ||
| 68 | - aws-sdk-resources (= 2.3.0) | ||
| 69 | - aws-sdk-core (2.3.0) | 67 | + aws-sdk (2.3.1) |
| 68 | + aws-sdk-resources (= 2.3.1) | ||
| 69 | + aws-sdk-core (2.3.1) | ||
| 70 | jmespath (~> 1.0) | 70 | jmespath (~> 1.0) |
| 71 | - aws-sdk-resources (2.3.0) | ||
| 72 | - aws-sdk-core (= 2.3.0) | 71 | + aws-sdk-resources (2.3.1) |
| 72 | + aws-sdk-core (= 2.3.1) | ||
| 73 | backport_new_renderer (1.0.0) | 73 | backport_new_renderer (1.0.0) |
| 74 | rails | 74 | rails |
| 75 | bcrypt (3.1.11) | 75 | bcrypt (3.1.11) |
| @@ -81,7 +81,7 @@ GEM | @@ -81,7 +81,7 @@ GEM | ||
| 81 | delayed_job_active_record (4.1.0) | 81 | delayed_job_active_record (4.1.0) |
| 82 | activerecord (>= 3.0, < 5) | 82 | activerecord (>= 3.0, < 5) |
| 83 | delayed_job (>= 3.0, < 5) | 83 | delayed_job (>= 3.0, < 5) |
| 84 | - devise (4.0.1) | 84 | + devise (4.1.0) |
| 85 | bcrypt (~> 3.0) | 85 | bcrypt (~> 3.0) |
| 86 | orm_adapter (~> 0.1) | 86 | orm_adapter (~> 0.1) |
| 87 | railties (>= 4.1.0, < 5.1) | 87 | railties (>= 4.1.0, < 5.1) |
| @@ -118,7 +118,7 @@ GEM | @@ -118,7 +118,7 @@ GEM | ||
| 118 | mime-types-data (3.2016.0221) | 118 | mime-types-data (3.2016.0221) |
| 119 | mini_portile (0.5.3) | 119 | mini_portile (0.5.3) |
| 120 | minitest (5.8.4) | 120 | minitest (5.8.4) |
| 121 | - multi_json (1.11.3) | 121 | + multi_json (1.12.0) |
| 122 | nokogiri (1.6.1) | 122 | nokogiri (1.6.1) |
| 123 | mini_portile (~> 0.5.0) | 123 | mini_portile (~> 0.5.0) |
| 124 | orm_adapter (0.5.0) | 124 | orm_adapter (0.5.0) |
| @@ -16,7 +16,7 @@ module Kanjai | @@ -16,7 +16,7 @@ module Kanjai | ||
| 16 | end | 16 | end |
| 17 | #look - exist template or not for page | 17 | #look - exist template or not for page |
| 18 | if @page_data.page.page_template | 18 | if @page_data.page.page_template |
| 19 | - if stale?(@page_data) or current_admin_user | 19 | + if stale?(@page_data, public: true) or current_admin_user |
| 20 | #get page content | 20 | #get page content |
| 21 | layer = @page_data.page.page_template.get_html_content | 21 | layer = @page_data.page.page_template.get_html_content |
| 22 | content_for_render = setTemplateContent(@page_data.page.page_template, layer, @page_data) | 22 | content_for_render = setTemplateContent(@page_data.page.page_template, layer, @page_data) |