Commit 7e56725a63f7fea1cf5d6cdc9d84a0e2b2c60fbe

Authored by Karpikau Andrei
1 parent 95a39b2d

change version

... ... @@ -27,7 +27,7 @@
27 27 <file leaf-file-name="install.rake" pinned="false" current-in-tab="false">
28 28 <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
29 29 <provider selected="true" editor-type-id="text-editor">
30   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
  30 + <state vertical-scroll-proportion="0.0" vertical-offset="90" max-vertical-offset="390">
31 31 <caret line="6" column="40" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="40" />
32 32 <folding />
33 33 </state>
... ... @@ -47,8 +47,8 @@
47 47 <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
48 48 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
49 49 <provider selected="true" editor-type-id="text-editor">
50   - <state vertical-scroll-proportion="0.0" vertical-offset="1316" max-vertical-offset="2370">
51   - <caret line="122" column="15" selection-start-line="122" selection-start-column="15" selection-end-line="122" selection-end-column="15" />
  50 + <state vertical-scroll-proportion="0.0" vertical-offset="491" max-vertical-offset="2370">
  51 + <caret line="49" column="74" selection-start-line="49" selection-start-column="74" selection-end-line="49" selection-end-column="74" />
52 52 <folding />
53 53 </state>
54 54 </provider>
... ... @@ -77,7 +77,7 @@
77 77 <file leaf-file-name="application_controller.rb" pinned="false" current-in-tab="false">
78 78 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
79 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="180" max-vertical-offset="330">
81 81 <caret line="12" column="13" selection-start-line="12" selection-start-column="6" selection-end-line="12" selection-end-column="13" />
82 82 <folding />
83 83 </state>
... ... @@ -214,8 +214,6 @@
214 214 <sortByType />
215 215 </navigator>
216 216 <panes>
217   - <pane id="Scope" />
218   - <pane id="RailsProjectView" />
219 217 <pane id="ProjectPane">
220 218 <subPane>
221 219 <PATH>
... ... @@ -354,6 +352,8 @@
354 352 </PATH>
355 353 </subPane>
356 354 </pane>
  355 + <pane id="RailsProjectView" />
  356 + <pane id="Scope" />
357 357 </panes>
358 358 </component>
359 359 <component name="PropertiesComponent">
... ... @@ -535,26 +535,26 @@
535 535 <frame x="0" y="23" width="1280" height="728" extended-state="6" />
536 536 <editor active="true" />
537 537 <layout>
538   - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
539 538 <window_info id="Changes" 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" />
540 539 <window_info id="Terminal" 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" />
541 540 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
542 541 <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" />
543 542 <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" />
544 543 <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" />
545   - <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" />
  544 + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2819063" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
546 545 <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" />
547 546 <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" />
548 547 <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" />
549 548 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
550 549 <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
551   - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
552 550 <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
  551 + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
553 552 <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
  553 + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
554 554 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
555   - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
556   - <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
557 555 <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
  556 + <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
  557 + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
558 558 </layout>
559 559 </component>
560 560 <component name="Vcs.Log.UiProperties">
... ... @@ -778,7 +778,6 @@
778 778 <provider selected="true" editor-type-id="text-editor">
779 779 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="416">
780 780 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
781   - <folding />
782 781 </state>
783 782 </provider>
784 783 </entry>
... ... @@ -800,7 +799,6 @@
800 799 <provider selected="true" editor-type-id="text-editor">
801 800 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
802 801 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
803   - <folding />
804 802 </state>
805 803 </provider>
806 804 </entry>
... ... @@ -896,50 +894,50 @@
896 894 </state>
897 895 </provider>
898 896 </entry>
899   - <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb">
  897 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb">
900 898 <provider selected="true" editor-type-id="text-editor">
901   - <state vertical-scroll-proportion="0.0" vertical-offset="735" max-vertical-offset="1995">
902   - <caret line="53" column="62" selection-start-line="53" selection-start-column="62" selection-end-line="53" selection-end-column="62" />
  899 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  900 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
903 901 <folding />
904 902 </state>
905 903 </provider>
906 904 </entry>
907   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
  905 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
908 906 <provider selected="true" editor-type-id="text-editor">
909   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4230">
910   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  907 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
  908 + <caret line="12" column="13" selection-start-line="12" selection-start-column="6" selection-end-line="12" selection-end-column="13" />
911 909 <folding />
912 910 </state>
913 911 </provider>
914 912 </entry>
915   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb">
  913 + <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
916 914 <provider selected="true" editor-type-id="text-editor">
917   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
918   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  915 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
  916 + <caret line="6" column="40" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="40" />
919 917 <folding />
920 918 </state>
921 919 </provider>
922 920 </entry>
923   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
  921 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
924 922 <provider selected="true" editor-type-id="text-editor">
925   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
926   - <caret line="12" column="13" selection-start-line="12" selection-start-column="6" selection-end-line="12" selection-end-column="13" />
  923 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4230">
  924 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
927 925 <folding />
928 926 </state>
929 927 </provider>
930 928 </entry>
931   - <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
  929 + <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb">
932 930 <provider selected="true" editor-type-id="text-editor">
933   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
934   - <caret line="6" column="40" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="40" />
  931 + <state vertical-scroll-proportion="0.0" vertical-offset="735" max-vertical-offset="1995">
  932 + <caret line="53" column="62" selection-start-line="53" selection-start-column="62" selection-end-line="53" selection-end-column="62" />
935 933 <folding />
936 934 </state>
937 935 </provider>
938 936 </entry>
939 937 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
940 938 <provider selected="true" editor-type-id="text-editor">
941   - <state vertical-scroll-proportion="0.0" vertical-offset="1316" max-vertical-offset="2370">
942   - <caret line="122" column="15" selection-start-line="122" selection-start-column="15" selection-end-line="122" selection-end-column="15" />
  939 + <state vertical-scroll-proportion="0.0" vertical-offset="491" max-vertical-offset="2370">
  940 + <caret line="49" column="74" selection-start-line="49" selection-start-column="74" selection-end-line="49" selection-end-column="74" />
943 941 <folding />
944 942 </state>
945 943 </provider>
... ...
1 1 PATH
2 2 remote: .
3 3 specs:
4   - kanjai (0.0.31)
  4 + kanjai (0.0.32)
5 5 acts_as_list
6 6 acts_as_tree
7 7 aws-sdk
... ...
... ... @@ -114,11 +114,11 @@ module Kanjai
114 114 end
115 115 layer.gsub!(marker, content)
116 116 when '###CSRF_PARAM###'
117   - unless current_admin_user
  117 + if current_admin_user
118 118 layer.gsub!(marker, Rack::Utils.escape_html(request_forgery_protection_token))
119 119 end
120 120 when '###CSRF_TOKEN###'
121   - unless current_admin_user
  121 + if current_admin_user
122 122 layer.gsub!(marker, Rack::Utils.escape_html(form_authenticity_token))
123 123 end
124 124 when '###DOMAIN_NAME###'
... ...
1 1 module Kanjai
2   - VERSION = "0.0.32"
  2 + VERSION = "0.0.33"
3 3 end
... ...