EDIT / kanjai · Commits

Commit 421cb911790c1ef9e5301ef78132baebc1812a98

Authored by Karpikau Andrei
1 parent 26a084c3

change kanjai version

Inline Side-by-side
Showing 4 changed files with 7 additions and 29 deletions
... ... @@ -48,7 +48,7 @@
48 48 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
49 49 <provider selected="true" editor-type-id="text-editor">
50 50 <state vertical-scroll-proportion="0.0" vertical-offset="14" max-vertical-offset="2160">
51   - <caret line="7" column="44" selection-start-line="7" selection-start-column="44" selection-end-line="7" selection-end-column="44" />
  51 + <caret line="23" column="10" selection-start-line="23" selection-start-column="10" selection-end-line="23" selection-end-column="10" />
52 52 <folding />
53 53 </state>
54 54 </provider>
... ... @@ -326,28 +326,6 @@
326 326 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
327 327 </PATH_ELEMENT>
328 328 <PATH_ELEMENT>
329   - <option name="myItemId" value="models" />
330   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
331   - </PATH_ELEMENT>
332   - <PATH_ELEMENT>
333   - <option name="myItemId" value="kanjai" />
334   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
335   - </PATH_ELEMENT>
336   - </PATH>
337   - <PATH>
338   - <PATH_ELEMENT>
339   - <option name="myItemId" value="kanjai" />
340   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
341   - </PATH_ELEMENT>
342   - <PATH_ELEMENT>
343   - <option name="myItemId" value="kanjai" />
344   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
345   - </PATH_ELEMENT>
346   - <PATH_ELEMENT>
347   - <option name="myItemId" value="app" />
348   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
349   - </PATH_ELEMENT>
350   - <PATH_ELEMENT>
351 329 <option name="myItemId" value="controllers" />
352 330 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
353 331 </PATH_ELEMENT>
... ... @@ -961,7 +939,7 @@
961 939 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
962 940 <provider selected="true" editor-type-id="text-editor">
963 941 <state vertical-scroll-proportion="0.0" vertical-offset="14" max-vertical-offset="2160">
964   - <caret line="7" column="44" selection-start-line="7" selection-start-column="44" selection-end-line="7" selection-end-column="44" />
  942 + <caret line="23" column="10" selection-start-line="23" selection-start-column="10" selection-end-line="23" selection-end-column="10" />
965 943 <folding />
966 944 </state>
967 945 </provider>
... ...
1 1 PATH
2 2 remote: .
3 3 specs:
4   - kanjai (0.0.27)
  4 + kanjai (0.0.28)
5 5 acts_as_list
6 6 acts_as_tree
7 7 aws-sdk
... ...
... ... @@ -5,7 +5,7 @@ module Kanjai
5 5
6 6
7 7 def show
8   - expires_in 10.minutes, :public => true
  8 + #expires_in 10.minutes, :public => true
9 9 if @page_data
10 10 if @page_data.page.private_flag == true
11 11 if !!UserSession
... ... @@ -16,12 +16,12 @@ module Kanjai
16 16 end
17 17 #look - exist template or not for page
18 18 if @page_data.page.page_template
19   - #if stale?(@page_data, public: true) or current_admin_user
  19 + if stale?(@page_data, public: true) or current_admin_user
20 20 #get page content
21 21 layer = @page_data.page.page_template.get_html_content
22 22 content_for_render = setTemplateContent(@page_data.page.page_template, layer, @page_data)
23 23 render :text => content_for_render and return
24   - #end
  24 + end
25 25 #render :html => content_for_render.html_safe
26 26 else
27 27 page_content = get_html_by_json_client(@page_data)
... ...
1 1 module Kanjai
2   - VERSION = "0.0.28"
  2 + VERSION = "0.0.29"
3 3 end
... ...