knitkit 2.1.13 → 2.1.14

data/app/controllers/knitkit/base_controller.rb

@@ -31,6 +31,7 @@ module Knitkit
     def set_section
       unless params[:section_id].nil?
         @website_section = WebsiteSection.find(params[:section_id])
+        @website_section = @website_section.root if @website_section.is_document_section? # check security on root document section
         if @website_section.protected_with_capability?(:view)
           if !current_user and @website_section.path != @login_path
             session[:return_to_url] = @website_section.path

data/app/controllers/knitkit/online_document_sections_controller.rb

@@ -4,8 +4,8 @@ module Knitkit
 
     layout 'knitkit/online_document_sections'
 
-    before_filter :find_root
-    before_filter :find_document_sections, :only => :build_tree
+    append_before_filter :find_root
+    append_before_filter :find_document_sections, :only => :build_tree
 
     def index
       @online_document = OnlineDocumentSection.find(params[:section_id])
@@ -31,8 +31,10 @@ module Knitkit
     end
 
     def get_content
-      document_section = OnlineDocumentSection.find(params[:document_section_id])
-      content = document_section.documented_item_published_content(@active_publication)
+      document_section = OnlineDocumentSection.where(:internal_identifier => params[:document_section_id]).first
+      content = document_section.documented_item_published_content(@active_publication) unless @active_publication.nil?
+      content = document_section.documented_item.content if @active_publication.nil? or content.nil?
+
       if document_section.use_markdown and content
         html = Kramdown::Document.new(content.body_html).to_html
       else

data/app/views/knitkit/online_document_sections/index.html.erb

@@ -226,11 +226,10 @@
         resize_windows();
 
         // Load root page
-
         Ext.Ajax.request({
             url: '/online_document_sections/get_content',
             params: {
-                document_section_id:<%= @root.id %>,
+                document_section_id:'<%= @root.internal_identifier %>',
                 section_id:<%= @root.id %>
             },
             success: function (response) {

data/lib/knitkit/version.rb

@@ -2,7 +2,7 @@ module Knitkit
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 1
-    TINY  = 13
+    TINY  = 14
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

data/public/javascripts/erp_app/desktop/applications/knitkit/west_region/helpers/document.js

@@ -1,4 +1,16 @@
 Compass.ErpApp.Desktop.Applications.Knitkit.addDocumentOptions = function (self, items, record) {
+    if (currentUser.hasCapability('unsecure','WebsiteSection') || currentUser.hasCapability('secure','WebsiteSection')) {
+        items.push({
+            text:'Security',
+            iconCls:'icon-document_lock',
+            listeners:{
+                'click':function () {
+                    self.changeSecurity(record, '/knitkit/erp_app/desktop/section/update_security', record.data.id.split('_')[1]);
+                }
+            }
+        });
+    }
+
     if (currentUser.hasCapability('create','WebsiteSection')) {
         items.push({
             text:'Add Document',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knitkit
 version: !ruby/object:Gem::Version
-  version: 2.1.13
+  version: 2.1.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-14 00:00:00.000000000 Z
+date: 2013-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erp_forms