EDIT / kanjai · Commits

Commit 4b1bb39127a03693a519c0cb6cad048379968a34

Authored by Karpikau Andrei
1 parent d219b6e4

change version

Inline Side-by-side
Showing 5 changed files with 85 additions and 70 deletions
... ... @@ -2,8 +2,9 @@
2 2 <project version="4">
3 3 <component name="ChangeListManager">
4 4 <list default="true" id="cbbcb0f9-d203-4967-aa4d-c08a939c7df0" name="Default" comment="">
5   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
6   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
  5 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Gemfile.lock" afterPath="$PROJECT_DIR$/Gemfile.lock" />
  6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
  7 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/kanjai/page_template.rb" afterPath="$PROJECT_DIR$/app/models/kanjai/page_template.rb" />
7 8 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/kanjai/version.rb" afterPath="$PROJECT_DIR$/lib/kanjai/version.rb" />
8 9 </list>
9 10 <ignored path="kanjai.iws" />
... ... @@ -25,31 +26,41 @@
25 26 </component>
26 27 <component name="FileEditorManager">
27 28 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
28   - <file leaf-file-name="form_controller.rb" pinned="false" current-in-tab="false">
29   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/form_controller.rb">
  29 + <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
  30 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
30 31 <provider selected="true" editor-type-id="text-editor">
31   - <state relative-caret-position="135">
32   - <caret line="9" column="32" lean-forward="false" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
  32 + <state relative-caret-position="353">
  33 + <caret line="90" column="10" lean-forward="false" selection-start-line="90" selection-start-column="10" selection-end-line="90" selection-end-column="10" />
33 34 <folding />
34 35 </state>
35 36 </provider>
36 37 </entry>
37 38 </file>
38   - <file leaf-file-name="engine.rb" pinned="false" current-in-tab="false">
39   - <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
  39 + <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
  40 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
40 41 <provider selected="true" editor-type-id="text-editor">
41   - <state relative-caret-position="0">
42   - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  42 + <state relative-caret-position="214">
  43 + <caret line="30" column="66" lean-forward="false" selection-start-line="30" selection-start-column="50" selection-end-line="30" selection-end-column="66" />
43 44 <folding />
44 45 </state>
45 46 </provider>
46 47 </entry>
47 48 </file>
48   - <file leaf-file-name="install.rake" pinned="false" current-in-tab="false">
49   - <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
  49 + <file leaf-file-name="page_template.rb" pinned="false" current-in-tab="false">
  50 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
50 51 <provider selected="true" editor-type-id="text-editor">
51   - <state relative-caret-position="165">
52   - <caret line="11" column="19" lean-forward="false" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="19" />
  52 + <state relative-caret-position="503">
  53 + <caret line="169" column="15" lean-forward="false" selection-start-line="169" selection-start-column="15" selection-end-line="169" selection-end-column="15" />
  54 + <folding />
  55 + </state>
  56 + </provider>
  57 + </entry>
  58 + </file>
  59 + <file leaf-file-name="page_datum.rb" pinned="false" current-in-tab="false">
  60 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_datum.rb">
  61 + <provider selected="true" editor-type-id="text-editor">
  62 + <state relative-caret-position="0">
  63 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
53 64 <folding />
54 65 </state>
55 66 </provider>
... ... @@ -75,16 +86,6 @@
75 86 </provider>
76 87 </entry>
77 88 </file>
78   - <file leaf-file-name="aws.rb" pinned="false" current-in-tab="false">
79   - <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
80   - <provider selected="true" editor-type-id="text-editor">
81   - <state relative-caret-position="90">
82   - <caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
83   - <folding />
84   - </state>
85   - </provider>
86   - </entry>
87   - </file>
88 89 <file leaf-file-name="frontend.js" pinned="false" current-in-tab="false">
89 90 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
90 91 <provider selected="true" editor-type-id="text-editor">
... ... @@ -108,8 +109,8 @@
108 109 <file leaf-file-name="site_controller.rb" pinned="false" current-in-tab="false">
109 110 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
110 111 <provider selected="true" editor-type-id="text-editor">
111   - <state relative-caret-position="336">
112   - <caret line="23" column="21" lean-forward="false" selection-start-line="23" selection-start-column="21" selection-end-line="23" selection-end-column="21" />
  112 + <state relative-caret-position="203">
  113 + <caret line="37" column="17" lean-forward="false" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="17" />
113 114 <folding />
114 115 </state>
115 116 </provider>
... ... @@ -150,6 +151,8 @@
150 151 <find>handleRemote</find>
151 152 <find>data('remote</find>
152 153 <find>$current_locale</find>
  154 + <find>@page_data</find>
  155 + <find>get_html_content</find>
153 156 </findStrings>
154 157 <dirStrings>
155 158 <dir>$PROJECT_DIR$</dir>
... ... @@ -169,7 +172,6 @@
169 172 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/fileinput.css" />
170 173 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss" />
171 174 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js" />
172   - <option value="$PROJECT_DIR$/app/models/kanjai/page_template.rb" />
173 175 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js" />
174 176 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js" />
175 177 <option value="$PROJECT_DIR$/db/migrate/20160804133136_add_image_link_to_kanjai_images.rb" />
... ... @@ -195,7 +197,6 @@
195 197 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/admin_users_controller.rb" />
196 198 <option value="$PROJECT_DIR$/config/locales/en.yml" />
197 199 <option value="$PROJECT_DIR$/app/views/kanjai/admin/admin_users/edit.html.erb" />
198   - <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
199 200 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb" />
200 201 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb" />
201 202 <option value="$PROJECT_DIR$/db/migrate/20171214071607_add_form_data_to_page_content_marker.rb" />
... ... @@ -212,6 +213,8 @@
212 213 <option value="$PROJECT_DIR$/app/controllers/kanjai/form_controller.rb" />
213 214 <option value="$PROJECT_DIR$/kanjai.gemspec" />
214 215 <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
  216 + <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
  217 + <option value="$PROJECT_DIR$/app/models/kanjai/page_template.rb" />
215 218 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
216 219 </list>
217 220 </option>
... ... @@ -339,6 +342,14 @@
339 342 <option name="myItemId" value="app" />
340 343 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
341 344 </PATH_ELEMENT>
  345 + <PATH_ELEMENT>
  346 + <option name="myItemId" value="models" />
  347 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  348 + </PATH_ELEMENT>
  349 + <PATH_ELEMENT>
  350 + <option name="myItemId" value="kanjai" />
  351 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  352 + </PATH_ELEMENT>
342 353 </PATH>
343 354 <PATH>
344 355 <PATH_ELEMENT>
... ... @@ -706,12 +717,12 @@
706 717 <workItem from="1501482504677" duration="10000" />
707 718 <workItem from="1513232887722" duration="10776000" />
708 719 <workItem from="1513283335284" duration="121000" />
709   - <workItem from="1513543303254" duration="5769000" />
  720 + <workItem from="1513543303254" duration="6908000" />
710 721 </task>
711 722 <servers />
712 723 </component>
713 724 <component name="TimeTrackingManager">
714   - <option name="totallyTimeSpent" value="20479000" />
  725 + <option name="totallyTimeSpent" value="21618000" />
715 726 </component>
716 727 <component name="ToolWindowManager">
717 728 <frame x="0" y="23" width="1280" height="729" extended-state="6" />
... ... @@ -760,13 +771,6 @@
760 771 <watches-manager />
761 772 </component>
762 773 <component name="editorHistoryManager">
763   - <entry file="file://$PROJECT_DIR$/config/locales/en.yml">
764   - <provider selected="true" editor-type-id="text-editor">
765   - <state relative-caret-position="0">
766   - <caret line="91" column="28" lean-forward="false" selection-start-line="91" selection-start-column="28" selection-end-line="91" selection-end-column="28" />
767   - </state>
768   - </provider>
769   - </entry>
770 774 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/admin_users_controller.rb">
771 775 <provider selected="true" editor-type-id="text-editor">
772 776 <state relative-caret-position="0">
... ... @@ -851,13 +855,6 @@
851 855 </state>
852 856 </provider>
853 857 </entry>
854   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
855   - <provider selected="true" editor-type-id="text-editor">
856   - <state relative-caret-position="495">
857   - <caret line="33" column="34" lean-forward="false" selection-start-line="33" selection-start-column="12" selection-end-line="33" selection-end-column="34" />
858   - </state>
859   - </provider>
860   - </entry>
861 858 <entry file="file://$PROJECT_DIR$/README.rdoc">
862 859 <provider selected="true" editor-type-id="text-editor">
863 860 <state relative-caret-position="0">
... ... @@ -886,13 +883,6 @@
886 883 </state>
887 884 </provider>
888 885 </entry>
889   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
890   - <provider selected="true" editor-type-id="text-editor">
891   - <state relative-caret-position="391">
892   - <caret line="54" column="61" lean-forward="false" selection-start-line="54" selection-start-column="41" selection-end-line="54" selection-end-column="61" />
893   - </state>
894   - </provider>
895   - </entry>
896 886 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/structure.html.erb">
897 887 <provider selected="true" editor-type-id="text-editor">
898 888 <state relative-caret-position="0">
... ... @@ -1014,14 +1004,6 @@
1014 1004 </state>
1015 1005 </provider>
1016 1006 </entry>
1017   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
1018   - <provider selected="true" editor-type-id="text-editor">
1019   - <state relative-caret-position="4200">
1020   - <caret line="280" column="190" lean-forward="false" selection-start-line="280" selection-start-column="190" selection-end-line="280" selection-end-column="190" />
1021   - <folding />
1022   - </state>
1023   - </provider>
1024   - </entry>
1025 1007 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">
1026 1008 <provider selected="true" editor-type-id="text-editor">
1027 1009 <state relative-caret-position="675">
... ... @@ -1102,6 +1084,30 @@
1102 1084 </state>
1103 1085 </provider>
1104 1086 </entry>
  1087 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb">
  1088 + <provider selected="true" editor-type-id="text-editor">
  1089 + <state relative-caret-position="225">
  1090 + <caret line="15" column="6" lean-forward="false" selection-start-line="15" selection-start-column="6" selection-end-line="15" selection-end-column="23" />
  1091 + <folding />
  1092 + </state>
  1093 + </provider>
  1094 + </entry>
  1095 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
  1096 + <provider selected="true" editor-type-id="text-editor">
  1097 + <state relative-caret-position="353">
  1098 + <caret line="90" column="10" lean-forward="false" selection-start-line="90" selection-start-column="10" selection-end-line="90" selection-end-column="10" />
  1099 + <folding />
  1100 + </state>
  1101 + </provider>
  1102 + </entry>
  1103 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
  1104 + <provider selected="true" editor-type-id="text-editor">
  1105 + <state relative-caret-position="203">
  1106 + <caret line="37" column="17" lean-forward="false" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="17" />
  1107 + <folding />
  1108 + </state>
  1109 + </provider>
  1110 + </entry>
1105 1111 <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
1106 1112 <provider selected="true" editor-type-id="text-editor">
1107 1113 <state relative-caret-position="465">
... ... @@ -1110,18 +1116,26 @@
1110 1116 </state>
1111 1117 </provider>
1112 1118 </entry>
1113   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb">
  1119 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_datum.rb">
1114 1120 <provider selected="true" editor-type-id="text-editor">
1115   - <state relative-caret-position="225">
1116   - <caret line="15" column="6" lean-forward="false" selection-start-line="15" selection-start-column="6" selection-end-line="15" selection-end-column="23" />
  1121 + <state relative-caret-position="0">
  1122 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1117 1123 <folding />
1118 1124 </state>
1119 1125 </provider>
1120 1126 </entry>
1121   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
  1127 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  1128 + <provider selected="true" editor-type-id="text-editor">
  1129 + <state relative-caret-position="214">
  1130 + <caret line="30" column="66" lean-forward="false" selection-start-line="30" selection-start-column="50" selection-end-line="30" selection-end-column="66" />
  1131 + <folding />
  1132 + </state>
  1133 + </provider>
  1134 + </entry>
  1135 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
1122 1136 <provider selected="true" editor-type-id="text-editor">
1123   - <state relative-caret-position="336">
1124   - <caret line="23" column="21" lean-forward="false" selection-start-line="23" selection-start-column="21" selection-end-line="23" selection-end-column="21" />
  1137 + <state relative-caret-position="503">
  1138 + <caret line="169" column="15" lean-forward="false" selection-start-line="169" selection-start-column="15" selection-end-line="169" selection-end-column="15" />
1125 1139 <folding />
1126 1140 </state>
1127 1141 </provider>
... ...
1 1 PATH
2 2 remote: .
3 3 specs:
4   - kanjai (0.0.74)
  4 + kanjai (0.0.75)
5 5 acts_as_list
6 6 acts_as_tree
7 7 aws-sdk (= 2.6.32)
... ...
... ... @@ -27,6 +27,7 @@ module Kanjai
27 27
28 28
29 29 if current_admin_user || @page_data.page.private_flag == true || use_cache == false
  30 + p @page_data
30 31 layer = @page_data.page.page_template.get_html_content
31 32 content_for_render = setTemplateContent(@page_data.page.page_template, layer, @page_data)
32 33
... ...
... ... @@ -148,7 +148,7 @@ module Kanjai
148 148 end
149 149
150 150 def get_html_content
151   - if self.unzip == true
  151 + #if self.unzip == true
152 152 if S3_BUCKET.object("#{self.template_content_path}index.html").exists?
153 153 io = StringIO.new
154 154 S3_BUCKET.object("#{self.template_content_path}index.html").get({
... ... @@ -157,9 +157,9 @@ module Kanjai
157 157 return io.read
158 158 end
159 159
160   - end
  160 + #end
161 161
162   - return nil
  162 + return ''
163 163 end
164 164
165 165 def self.get_marker(layer)
... ...
1 1 module Kanjai
2   - VERSION = "0.0.75"
  2 + VERSION = "0.0.76"
3 3 end
... ...