Commit 68edaefe96c14659fd2577c30293355862acc093

Authored by Karpikau Andrei
1 parent 076ed7f3

support ENV in admin.yml file

... ... @@ -4,7 +4,7 @@
4 4 <list default="true" id="cbbcb0f9-d203-4967-aa4d-c08a939c7df0" name="Default" comment="">
5 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 6 <change beforePath="$PROJECT_DIR$/Gemfile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/Gemfile.lock" afterDir="false" />
7   - <change beforePath="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" beforeDir="false" afterPath="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" afterDir="false" />
  7 + <change beforePath="$PROJECT_DIR$/config/initializers/admin.rb" beforeDir="false" afterPath="$PROJECT_DIR$/config/initializers/admin.rb" afterDir="false" />
8 8 <change beforePath="$PROJECT_DIR$/lib/kanjai/version.rb" beforeDir="false" afterPath="$PROJECT_DIR$/lib/kanjai/version.rb" afterDir="false" />
9 9 </list>
10 10 <ignored path="kanjai.iws" />
... ... @@ -25,58 +25,29 @@
25 25 </component>
26 26 <component name="FileEditorManager">
27 27 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
28   - <file leaf-file-name="page_template.rb" pinned="false" current-in-tab="false">
29   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
  28 + <file leaf-file-name="aws.rb" pinned="false" current-in-tab="false">
  29 + <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
30 30 <provider selected="true" editor-type-id="text-editor">
31   - <state relative-caret-position="1815">
32   - <caret line="121" column="28" selection-start-line="121" selection-start-column="28" selection-end-line="121" selection-end-column="28" />
  31 + <state relative-caret-position="75">
  32 + <caret line="5" column="57" selection-start-line="5" selection-start-column="41" selection-end-line="5" selection-end-column="57" />
33 33 </state>
34 34 </provider>
35 35 </entry>
36 36 </file>
37   - <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
38   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
39   - <provider selected="true" editor-type-id="text-editor">
40   - <state relative-caret-position="495">
41   - <caret line="33" column="34" lean-forward="true" selection-start-line="33" selection-start-column="34" selection-end-line="33" selection-end-column="34" />
42   - </state>
43   - </provider>
44   - </entry>
45   - </file>
46   - <file leaf-file-name="page_templates_controller.rb" pinned="false" current-in-tab="false">
47   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/page_templates_controller.rb">
48   - <provider selected="true" editor-type-id="text-editor">
49   - <state relative-caret-position="1500">
50   - <caret line="100" column="21" selection-start-line="100" selection-start-column="6" selection-end-line="100" selection-end-column="21" />
51   - </state>
52   - </provider>
53   - </entry>
54   - </file>
55   - <file leaf-file-name="jquery.fileupload.js" pinned="false" current-in-tab="false">
56   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js">
57   - <provider selected="true" editor-type-id="text-editor">
58   - <state>
59   - <folding>
60   - <element signature="n#!!doc" expanded="true" />
61   - </folding>
62   - </state>
63   - </provider>
64   - </entry>
65   - </file>
66   - <file leaf-file-name="admin.js" pinned="false" current-in-tab="false">
67   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
  37 + <file leaf-file-name="template_generator.rb" pinned="false" current-in-tab="false">
  38 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
68 39 <provider selected="true" editor-type-id="text-editor">
69   - <state relative-caret-position="2295">
70   - <caret line="153" column="51" selection-start-line="153" selection-start-column="27" selection-end-line="153" selection-end-column="51" />
  40 + <state relative-caret-position="3390">
  41 + <caret line="226" column="42" selection-start-line="226" selection-start-column="23" selection-end-line="226" selection-end-column="42" />
71 42 </state>
72 43 </provider>
73 44 </entry>
74 45 </file>
75   - <file leaf-file-name=".ruby-version" pinned="false" current-in-tab="false">
76   - <entry file="file://$PROJECT_DIR$/.ruby-version">
  46 + <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
  47 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
77 48 <provider selected="true" editor-type-id="text-editor">
78   - <state>
79   - <caret column="5" selection-end-column="5" />
  49 + <state relative-caret-position="495">
  50 + <caret line="33" column="34" selection-start-line="33" selection-start-column="34" selection-end-line="33" selection-end-column="34" />
80 51 </state>
81 52 </provider>
82 53 </entry>
... ... @@ -102,12 +73,31 @@
102 73 <file leaf-file-name="devise.rb" pinned="false" current-in-tab="false">
103 74 <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
104 75 <provider selected="true" editor-type-id="text-editor">
105   - <state relative-caret-position="180">
106   - <caret line="12" column="3" selection-start-line="12" selection-start-column="3" selection-end-line="12" selection-end-column="3" />
  76 + <state relative-caret-position="90">
  77 + <caret line="6" column="46" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="46" />
107 78 </state>
108 79 </provider>
109 80 </entry>
110 81 </file>
  82 + <file leaf-file-name="admin.rb" pinned="false" current-in-tab="false">
  83 + <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb">
  84 + <provider selected="true" editor-type-id="text-editor">
  85 + <state relative-caret-position="45">
  86 + <caret line="3" column="46" selection-start-line="3" selection-start-column="46" selection-end-line="3" selection-end-column="46" />
  87 + </state>
  88 + </provider>
  89 + </entry>
  90 + </file>
  91 + <file leaf-file-name="kanjai.rb" pinned="false" current-in-tab="false">
  92 + <entry file="file://$PROJECT_DIR$/lib/kanjai.rb">
  93 + <provider selected="true" editor-type-id="text-editor" />
  94 + </entry>
  95 + </file>
  96 + <file leaf-file-name="engine.rb" pinned="false" current-in-tab="false">
  97 + <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
  98 + <provider selected="true" editor-type-id="text-editor" />
  99 + </entry>
  100 + </file>
111 101 <file leaf-file-name="20160707115443_add_show_public_only_to_kanjai_pages.rb" pinned="false" current-in-tab="false">
112 102 <entry file="file://$PROJECT_DIR$/db/migrate/20160707115443_add_show_public_only_to_kanjai_pages.rb">
113 103 <provider selected="true" editor-type-id="text-editor">
... ... @@ -165,7 +155,6 @@
165 155 <component name="IdeDocumentHistory">
166 156 <option name="CHANGED_PATHS">
167 157 <list>
168   - <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js" />
169 158 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/fileinput.css" />
170 159 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss" />
171 160 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js" />
... ... @@ -215,6 +204,7 @@
215 204 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb" />
216 205 <option value="$PROJECT_DIR$/config/initializers/devise.rb" />
217 206 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
  207 + <option value="$PROJECT_DIR$/config/initializers/admin.rb" />
218 208 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
219 209 </list>
220 210 </option>
... ... @@ -249,55 +239,37 @@
249 239 <path>
250 240 <item name="kanjai" type="b2602c69:ProjectViewProjectNode" />
251 241 <item name="kanjai" type="462c0819:PsiDirectoryNode" />
252   - <item name="app" type="462c0819:PsiDirectoryNode" />
253   - </path>
254   - <path>
255   - <item name="kanjai" type="b2602c69:ProjectViewProjectNode" />
256   - <item name="kanjai" type="462c0819:PsiDirectoryNode" />
257   - <item name="app" type="462c0819:PsiDirectoryNode" />
258   - <item name="assets" type="462c0819:PsiDirectoryNode" />
259   - </path>
260   - <path>
261   - <item name="kanjai" type="b2602c69:ProjectViewProjectNode" />
262   - <item name="kanjai" type="462c0819:PsiDirectoryNode" />
263   - <item name="app" type="462c0819:PsiDirectoryNode" />
264   - <item name="controllers" type="462c0819:PsiDirectoryNode" />
265   - </path>
266   - <path>
267   - <item name="kanjai" type="b2602c69:ProjectViewProjectNode" />
268   - <item name="kanjai" type="462c0819:PsiDirectoryNode" />
269   - <item name="app" type="462c0819:PsiDirectoryNode" />
270   - <item name="controllers" type="462c0819:PsiDirectoryNode" />
271   - <item name="kanjai" type="462c0819:PsiDirectoryNode" />
  242 + <item name="config" type="462c0819:PsiDirectoryNode" />
272 243 </path>
273 244 <path>
274 245 <item name="kanjai" type="b2602c69:ProjectViewProjectNode" />
275 246 <item name="kanjai" type="462c0819:PsiDirectoryNode" />
276 247 <item name="config" type="462c0819:PsiDirectoryNode" />
  248 + <item name="initializers" type="462c0819:PsiDirectoryNode" />
277 249 </path>
278 250 <path>
279 251 <item name="kanjai" type="b2602c69:ProjectViewProjectNode" />
280 252 <item name="kanjai" type="462c0819:PsiDirectoryNode" />
281   - <item name="config" type="462c0819:PsiDirectoryNode" />
282   - <item name="initializers" type="462c0819:PsiDirectoryNode" />
  253 + <item name="lib" type="462c0819:PsiDirectoryNode" />
283 254 </path>
284 255 <path>
285 256 <item name="kanjai" type="b2602c69:ProjectViewProjectNode" />
286 257 <item name="kanjai" type="462c0819:PsiDirectoryNode" />
287 258 <item name="lib" type="462c0819:PsiDirectoryNode" />
  259 + <item name="kanjai" type="462c0819:PsiDirectoryNode" />
288 260 </path>
289 261 <path>
290 262 <item name="kanjai" type="b2602c69:ProjectViewProjectNode" />
291 263 <item name="kanjai" type="462c0819:PsiDirectoryNode" />
292 264 <item name="lib" type="462c0819:PsiDirectoryNode" />
293   - <item name="kanjai" type="462c0819:PsiDirectoryNode" />
  265 + <item name="tasks" type="462c0819:PsiDirectoryNode" />
294 266 </path>
295 267 </expand>
296 268 <select />
297 269 </subPane>
298 270 </pane>
299   - <pane id="RailsProjectView" />
300 271 <pane id="Scope" />
  272 + <pane id="RailsProjectView" />
301 273 </panes>
302 274 </component>
303 275 <component name="PropertiesComponent">
... ... @@ -572,28 +544,34 @@
572 544 <workItem from="1528797772730" duration="2306000" />
573 545 <workItem from="1528983596909" duration="231000" />
574 546 <workItem from="1528984727408" duration="942000" />
575   - <workItem from="1529067232509" duration="381000" />
  547 + <workItem from="1529067232509" duration="427000" />
  548 + <workItem from="1529134009751" duration="477000" />
  549 + <workItem from="1530563947793" duration="325000" />
  550 + <workItem from="1532497382207" duration="775000" />
  551 + <workItem from="1532528310773" duration="526000" />
  552 + <workItem from="1532617523201" duration="881000" />
  553 + <workItem from="1533023763618" duration="569000" />
  554 + <workItem from="1533043884272" duration="151000" />
576 555 </task>
577 556 <servers />
578 557 </component>
579 558 <component name="TimeTrackingManager">
580   - <option name="totallyTimeSpent" value="45280000" />
  559 + <option name="totallyTimeSpent" value="49030000" />
581 560 </component>
582 561 <component name="ToolWindowManager">
583   - <frame x="0" y="23" width="1280" height="729" extended-state="6" />
  562 + <frame x="0" y="23" width="1280" height="730" extended-state="6" />
584 563 <editor active="true" />
585 564 <layout>
  565 + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.37421876" />
586 566 <window_info anchor="bottom" id="TODO" order="6" />
  567 + <window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
587 568 <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" weight="0.32930514" />
  569 + <window_info anchor="right" id="Database" order="3" />
588 570 <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
589 571 <window_info anchor="bottom" id="Run" order="2" />
590 572 <window_info anchor="bottom" id="Version Control" order="7" />
591   - <window_info anchor="bottom" id="Terminal" order="7" />
592   - <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.37421876" />
593   - <window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
594   - <window_info anchor="right" id="Database" order="3" />
595   - <window_info anchor="bottom" id="Find" order="1" weight="0.32930514" />
596 573 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
  574 + <window_info anchor="bottom" id="Terminal" order="7" />
597 575 <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
598 576 <window_info id="Favorites" order="2" side_tool="true" />
599 577 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
... ... @@ -605,6 +583,7 @@
605 583 <window_info anchor="bottom" id="Messages" order="7" weight="0.32930514" />
606 584 <window_info anchor="bottom" id="Message" order="0" />
607 585 <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
  586 + <window_info anchor="bottom" id="Find" order="1" weight="0.32930514" />
608 587 </layout>
609 588 </component>
610 589 <component name="TypeScriptGeneratedFilesManager">
... ... @@ -627,27 +606,6 @@
627 606 </breakpoint-manager>
628 607 </component>
629 608 <component name="editorHistoryManager">
630   - <entry file="file://$PROJECT_DIR$/db/migrate/20160707115443_add_show_public_only_to_kanjai_pages.rb">
631   - <provider selected="true" editor-type-id="text-editor">
632   - <state relative-caret-position="30">
633   - <caret line="2" column="73" lean-forward="true" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="73" />
634   - </state>
635   - </provider>
636   - </entry>
637   - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
638   - <provider selected="true" editor-type-id="text-editor">
639   - <state relative-caret-position="4395">
640   - <caret line="293" column="41" selection-start-line="293" selection-start-column="41" selection-end-line="293" selection-end-column="41" />
641   - </state>
642   - </provider>
643   - </entry>
644   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
645   - <provider selected="true" editor-type-id="text-editor">
646   - <state relative-caret-position="2295">
647   - <caret line="153" column="51" lean-forward="true" selection-start-line="153" selection-start-column="27" selection-end-line="153" selection-end-column="51" />
648   - </state>
649   - </provider>
650   - </entry>
651 609 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
652 610 <provider selected="true" editor-type-id="text-editor">
653 611 <state relative-caret-position="15">
... ... @@ -886,13 +844,6 @@
886 844 </state>
887 845 </provider>
888 846 </entry>
889   - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
890   - <provider selected="true" editor-type-id="text-editor">
891   - <state relative-caret-position="4395">
892   - <caret line="293" column="41" selection-start-line="293" selection-start-column="41" selection-end-line="293" selection-end-column="41" />
893   - </state>
894   - </provider>
895   - </entry>
896 847 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/form_controller.rb">
897 848 <provider selected="true" editor-type-id="text-editor">
898 849 <state relative-caret-position="75">
... ... @@ -921,15 +872,6 @@
921 872 </state>
922 873 </provider>
923 874 </entry>
924   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js">
925   - <provider selected="true" editor-type-id="text-editor">
926   - <state>
927   - <folding>
928   - <element signature="n#!!doc" expanded="true" />
929   - </folding>
930   - </state>
931   - </provider>
932   - </entry>
933 875 <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
934 876 <provider selected="true" editor-type-id="text-editor">
935 877 <state relative-caret-position="1815">
... ... @@ -958,13 +900,6 @@
958 900 </state>
959 901 </provider>
960 902 </entry>
961   - <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
962   - <provider selected="true" editor-type-id="text-editor">
963   - <state relative-caret-position="180">
964   - <caret line="12" column="3" selection-start-line="12" selection-start-column="3" selection-end-line="12" selection-end-column="3" />
965   - </state>
966   - </provider>
967   - </entry>
968 903 <entry file="file://$PROJECT_DIR$/db/migrate/20160707115443_add_show_public_only_to_kanjai_pages.rb">
969 904 <provider selected="true" editor-type-id="text-editor">
970 905 <state relative-caret-position="30">
... ... @@ -975,10 +910,44 @@
975 910 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
976 911 <provider selected="true" editor-type-id="text-editor">
977 912 <state relative-caret-position="495">
978   - <caret line="33" column="34" lean-forward="true" selection-start-line="33" selection-start-column="34" selection-end-line="33" selection-end-column="34" />
  913 + <caret line="33" column="34" selection-start-line="33" selection-start-column="34" selection-end-line="33" selection-end-column="34" />
  914 + </state>
  915 + </provider>
  916 + </entry>
  917 + <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
  918 + <provider selected="true" editor-type-id="text-editor">
  919 + <state relative-caret-position="75">
  920 + <caret line="5" column="57" selection-start-line="5" selection-start-column="41" selection-end-line="5" selection-end-column="57" />
  921 + </state>
  922 + </provider>
  923 + </entry>
  924 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
  925 + <provider selected="true" editor-type-id="text-editor">
  926 + <state relative-caret-position="3390">
  927 + <caret line="226" column="42" selection-start-line="226" selection-start-column="23" selection-end-line="226" selection-end-column="42" />
  928 + </state>
  929 + </provider>
  930 + </entry>
  931 + <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
  932 + <provider selected="true" editor-type-id="text-editor">
  933 + <state relative-caret-position="90">
  934 + <caret line="6" column="46" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="46" />
979 935 </state>
980 936 </provider>
981 937 </entry>
  938 + <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb">
  939 + <provider selected="true" editor-type-id="text-editor">
  940 + <state relative-caret-position="45">
  941 + <caret line="3" column="46" selection-start-line="3" selection-start-column="46" selection-end-line="3" selection-end-column="46" />
  942 + </state>
  943 + </provider>
  944 + </entry>
  945 + <entry file="file://$PROJECT_DIR$/lib/kanjai.rb">
  946 + <provider selected="true" editor-type-id="text-editor" />
  947 + </entry>
  948 + <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
  949 + <provider selected="true" editor-type-id="text-editor" />
  950 + </entry>
982 951 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
983 952 <provider selected="true" editor-type-id="text-editor">
984 953 <state relative-caret-position="15">
... ...
1 1 PATH
2 2 remote: .
3 3 specs:
4   - kanjai (0.0.80)
  4 + kanjai (0.0.81)
5 5 acts_as_list
6 6 acts_as_tree
7 7 aws-sdk (= 2.6.32)
... ...
1   -ADMIN_CONFIG = YAML.load_file("#{Rails.root}/config/admin.yml")[Rails.env]
\ No newline at end of file
  1 +template = ERB.new File.new("#{Rails.root}/config/admin.yml").read
  2 +processed = template.result(binding)
  3 +
  4 +ADMIN_CONFIG = YAML.load(processed)[Rails.env]
\ No newline at end of file
... ...
1 1 module Kanjai
2   - VERSION = "0.0.81"
  2 + VERSION = "0.0.82"
3 3 end
... ...