knitkit 2.1.3 → 2.1.4

data/app/controllers/knitkit/base_controller.rb

@@ -33,6 +33,7 @@ module Knitkit
         @website_section = WebsiteSection.find(params[:section_id])
         if @website_section.protected_with_capability?(:view)
           if !current_user and @website_section.path != @login_path
+            session[:return_to_url] = @website_section.path
             redirect_to @login_path
           elsif current_user and !current_user.has_capability?(:view, @website_section)
             redirect_to Knitkit::Config.unauthorized_url

data/app/controllers/knitkit/erp_app/desktop/app_controller.rb

@@ -90,6 +90,7 @@ module Knitkit
             :canAddMenuItems => true,
             :websiteId => website.id,
             :isSecured => item.is_secured?,
+            :roles => item.roles.collect{|item| item.internal_identifier},
             :linkedToId => linked_to_item_id,
             :websiteNavItemId => item.id,
             :url => url,
@@ -114,6 +115,7 @@ module Knitkit
             :roles => website_section.roles.collect{|item| item.internal_identifier},
             :isSection => website_section.is_section?,
             :isDocument => website_section.is_document_section?,
+            :useMarkdown => website_section.use_markdown,
             :inMenu => website_section.in_menu,
             :renderWithBaseLayout => website_section.render_base_layout?,
             :hasLayout => !website_section.layout.blank?,

data/app/controllers/knitkit/erp_app/desktop/content_controller.rb

@@ -13,7 +13,7 @@ module Knitkit
               content.body_html = html
 
               if content.save
-                if params[:site_id]
+                unless params[:site_id].blank?
                   website = Website.find(params[:site_id])
                   content.publish(website, 'Auto Publish', content.version, current_user) if website.publish_on_save?
                 end
@@ -40,7 +40,7 @@ module Knitkit
               content.excerpt_html = html
 
               if content.save
-                if params[:site_id]
+                unless params[:site_id].blank?
                   website = Website.find(params[:site_id])
                   content.publish(website, 'Auto Publish', content.version, current_user) if website.publish_on_save?
                 end

data/app/controllers/knitkit/erp_app/desktop/website_nav_controller.rb

@@ -93,6 +93,7 @@ module Knitkit
                   :websiteId => website_nav.website.id,
                   :url => url,
                   :isSecure => false,
+                  :roles => [],
                   :canAddMenuItems => true,
                   :websiteNavItemId => website_nav_item.id,
                   :iconCls => 'icon-document',
@@ -155,18 +156,27 @@ module Knitkit
           if current_user.has_capability?('secure', 'WebsiteNavItem') or current_user.has_capability?('unsecure', 'WebsiteNavItem')
             website_nav_item = WebsiteNavItem.find(params[:id])
 
-            if params[:secure] == 'true'
-              c = website_nav_item.add_capability(:view)
-              roles = ['admin', 'website_author', website_nav_item.website_nav.website.website_role_iid]
+            roles = []
+
+            #get roles
+            params.each do |k, v|
+              if v == 'on'
+                roles.push(k)
+              end
+            end
+
+            if roles.empty?
+              website_nav_item.remove_capability(:view)
+            else
+              capability = website_nav_item.add_capability(:view)
+              capability.remove_all_roles
               roles.each do |r|
                 role = SecurityRole.find_by_internal_identifier(r)
-                role.add_capability(c)
+                role.add_capability(capability)
               end
-            else
-              website_nav_item.remove_capability(:view)
             end
 
-            render :json => {:success => true}
+            render :json => {:success => true, :secured => website_nav_item.is_secured?, :roles => website_nav_item.roles.collect{|item| item.internal_identifier}}
           else
             render :json => {:success => false, :message => "User does not have capability."}
           end

data/app/controllers/knitkit/erp_app/desktop/website_section_controller.rb

@@ -14,7 +14,6 @@ module Knitkit
                 result = {:success => false, :message => 'Blog can not be the title of a Blog'}
               else
                 website_section = WebsiteSection.new
-                website_section.website_id = website.id
                 website_section.in_menu = params[:in_menu] == 'yes'
                 website_section.title = params[:title]
                 website_section.render_base_layout = params[:render_with_base_layout] == 'yes'
@@ -26,6 +25,8 @@ module Knitkit
                   if params[:website_section_id]
                     parent_website_section = WebsiteSection.find(params[:website_section_id])
                     website_section.move_to_child_of(parent_website_section)
+                  else
+                    website_section.website_id = website.id
                   end
 
                   if params[:type] == "OnlineDocumentSection"
@@ -104,6 +105,12 @@ module Knitkit
               @website_section.render_base_layout = params[:render_with_base_layout] == 'yes'
               @website_section.internal_identifier = params[:internal_identifier]
 
+
+              #check if this is a OnlineDocumentSection if so set markdown
+              if @website_section.is_a?(OnlineDocumentSection) || @website_section.type == 'OnlineDocumentSection'
+                @website_section.use_markdown = (params[:use_markdown] == 'yes')
+              end
+
               website = @website_section.website
               if @website_section.save
                 @website_section.publish(website, 'Auto Publish', @website_section.version, current_user) if website.publish_on_save?

data/app/controllers/knitkit/online_document_sections_controller.rb

@@ -1,45 +1,53 @@
+require 'github/markdown'
+
 module Knitkit
   class OnlineDocumentSectionsController < BaseController
     layout 'knitkit/online_document_sections'
-    
+
     before_filter :find_root
     before_filter :find_document_sections, :only => :build_tree
 
     def index
-            
+
     end
-    
+
     def build_tree
       render :inline => build_document_hash.to_json
     end
-    
-    protected 
-    
+
+    def get_content
+      document_section = OnlineDocumentSection.find(params[:document_section_id])
+      content = document_section.documented_item_published_content(@active_publication)
+      if document_section.use_markdown and content
+        html = GitHub::Markdown.render_gfm(content.body_html)
+      else
+        html = content ? content.body_html : ''
+      end
+
+      render :json => {:success => true, :html => html}
+    end
+
+    protected
+
     def id_or_node
       (params[:node].to_i == 0) ? params[:section_id] : params[:node]
     end
-    
+
     def find_root
       @root = OnlineDocumentSection.find(params[:section_id])
-      if @root.documented_item_published_content(@active_publication)
-        @root_content = @root.documented_item_published_content(@active_publication).body_html.gsub(/\n/, '<br/>')
-      else
-        @root_content = ""
-      end
     end
-    
+
     def find_document_sections
       @document_sections = OnlineDocumentSection.find(id_or_node).positioned_children
     end
-    
+
     def build_document_hash
       [].tap do |documents|
         @document_sections.each do |section|
-          documents <<  {:id => section.id, :title => section.title, 
-                        :leaf => section.leaf, :documented_item_published_content_html => section.documented_item_published_content_html(@active_publication)}
+          documents << {:id => section.id, :title => section.title, :leaf => section.leaf}
         end
       end
     end
-    
+
   end
 end

data/app/models/documented_content.rb

@@ -1,17 +1,17 @@
 class DocumentedContent < Content
 
-  before_save :check_internal_indentifier
+  before_save :check_internal_identifier
 
   def to_param
     permalink
   end
 
-  def check_internal_indentifier
+  def check_internal_identifier
     self.internal_identifier = self.permalink if self.internal_identifier.blank?
   end
   
   def content_hash
-    {:id => self.id, :title => self.title, :body_html => self.body_html}  
+    {:id => self.id, :title => self.title, :body_html => self.body_html}
   end
   
   def self.find_published_by_section(active_publication, website_section)

data/app/models/online_document_section.rb

@@ -19,6 +19,7 @@ class OnlineDocumentSection < WebsiteSection
     section_hash = {
       :name => self.title,
       :has_layout => false,
+      :use_markdown => self.use_markdown,
       :type => self.class.to_s,
       :in_menu => self.in_menu,
       :path => self.path,

data/app/models/published_website.rb

@@ -3,7 +3,7 @@ class PublishedWebsite < ActiveRecord::Base
 
   belongs_to :website
   belongs_to :published_by, :class_name => "User"
-  has_many   :published_elements, :dependent => :destroy
+  has_many :published_elements, :dependent => :destroy
 
   def published_by_username
     self.published_by.username rescue ''
@@ -16,7 +16,7 @@ class PublishedWebsite < ActiveRecord::Base
       published_website.active = false
       published_website.save
     end
-    
+
     #activate
     published_website = self.where(:website_id => website.id).where(:version => version).first
     published_website.active = true
@@ -30,18 +30,25 @@ class PublishedWebsite < ActiveRecord::Base
 
     #get a publish sections
     website_sections = new_publication.website.website_sections
-    website_sections = website_sections | website_sections.collect{|section| section.descendants}.flatten
+    website_sections = website_sections | website_sections.collect { |section| section.descendants }.flatten
     website_sections.each do |website_section|
-      if new_publication.published_elements.where('published_element_record_id = ? and (published_element_record_type = ? or published_element_record_type = ?)', website_section.id, website_section.class.to_s, website_section.class.superclass.to_s).first.nil?
-        published_element = PublishedElement.new
-        published_element.published_website = new_publication
-        published_element.published_element_record = website_section
-        published_element.version = website_section.version
-        published_element.published_by = current_user
-        published_element.save
+      #get nested elements too
+      website_section.self_and_descendants.each do |website_section|
+        if new_publication.published_elements.where('published_element_record_id = ? and (published_element_record_type = ? or published_element_record_type = ?)', website_section.id, website_section.class.to_s, website_section.class.superclass.to_s).first.nil?
+          published_element = PublishedElement.new
+          published_element.published_website = new_publication
+          published_element.published_element_record = website_section
+          published_element.version = website_section.version
+          published_element.published_by = current_user
+          published_element.save
+        end
       end
 
-      elements = elements | website_section.contents
+      if website_section.is_a?(OnlineDocumentSection)
+        elements = elements | [website_section.documented_item.content]
+      else
+        elements = elements | website_section.contents
+      end
     end
 
     #make sure all elements have published_element objects

data/app/models/website.rb

@@ -1,8 +1,9 @@
 class Website < ActiveRecord::Base
   attr_protected :created_at, :updated_at
 
-  after_destroy :remove_sites_directory, :remove_website_role
-  after_create :setup_website
+  after_destroy  :remove_sites_directory, :remove_website_role
+  before_destroy :destroy_sections
+  after_create   :setup_website
 
   protected_with_capabilities
   has_file_assets
@@ -24,7 +25,7 @@ class Website < ActiveRecord::Base
       where('role_type_id = ?', RoleType.website_owner)
     end
   end
-  has_many :website_sections, :dependent => :destroy, :order => :lft do
+  has_many :website_sections, :order => :lft do
     def paths
       collect { |website_section| website_section.paths }.flatten
     end
@@ -53,6 +54,18 @@ class Website < ActiveRecord::Base
 
   alias :sections :website_sections
   alias :hosts :website_hosts
+  
+  #We only want to destroy parent sections as better nested set will destroy children for us
+  def destroy_sections
+    parents = []
+    website_sections.each do |section|
+      unless section.child?
+        parents << section
+      end
+    end
+    
+    parents.each {|parent| parent.destroy}
+  end
 
   def to_label
     self.name
@@ -208,7 +221,7 @@ class Website < ActiveRecord::Base
     setup_hash[:website_navs] = website_navs.collect do |website_nav|
       {
           :name => website_nav.name,
-          :items => website_nav.items.positioned.map { |website_nav_item| build_menu_item_hash(website_nav_item) }
+          :items => website_nav.items.positioned.map { |website_nav_item| website_nav_item.build_menu_item_hash }
       }
     end
 
@@ -260,7 +273,8 @@ class Website < ActiveRecord::Base
     end
 
     online_document_sections.each do |online_documented_section|
-      File.open(File.join(documented_contents_path, "#{online_documented_section.internal_identifier}.html"), 'wb+') { |f| f.puts(online_documented_section.documented_item_published_content_html(active_publication)) }
+      extension = online_documented_section.use_markdown == true ? 'md' : 'html'
+      File.open(File.join(documented_contents_path, "#{online_documented_section.internal_identifier}.#{extension}"), 'wb+') { |f| f.puts(online_documented_section.documented_item_published_content_html(active_publication)) }
     end
 
     self.files.where("directory like '%/sites/#{self.iid}/images%'").all.each do |image_asset|
@@ -452,9 +466,16 @@ class Website < ActiveRecord::Base
         child_website_item = build_menu_item(item)
         child_website_item.move_to_child_of(website_item)
       end
-      #add role if is_secured
-      website_item.add_role(website.role) if hash[:is_secured]
-
+      
+      #handle security
+      unless hash[:roles].empty? 
+        capability = website_item.add_capability(:view)
+        hash[:roles].each do |role_iid|
+          role = SecurityRole.find_by_internal_identifier(role_iid)
+          role.add_capability(capability)
+        end
+      end
+      
       website_item
     end
 
@@ -497,23 +518,38 @@ class Website < ActiveRecord::Base
         end
       end
       if section.is_a? OnlineDocumentSection
-        entry_data = entries.find { |entry| entry[:type] == 'documented contents' and entry[:name] == "#{section.internal_identifier}.html" }[:data]
+        section.use_markdown = hash[:use_markdown]
+        section.save
+        extension_type =  hash[:use_markdown] ? 'md' : 'html'
+        entry_data = entries.find { |entry| entry[:type] == 'documented contents' and entry[:name] == "#{section.internal_identifier}.#{extension_type}" }[:data]
         documented_content = DocumentedContent.create(:title => section.title, :body_html => entry_data)
         DocumentedItem.create(:documented_content_id => documented_content.id, :online_document_section_id => section.id)
       end
       if hash[:online_document_sections]
         hash[:online_document_sections].each do |section_hash|
           child_section = build_section(section_hash, entries, website, current_user)
+          child_section.use_markdown = section_hash[:use_markdown]
+          child_section.save
           child_section.move_to_child_of(section)
           # CREATE THE DOCUMENTED CONTENT HERE
-          entry_data = entries.find { |entry| entry[:type] == 'documented contents' and entry[:name] == "#{child_section.internal_identifier}.html" }[:data]
+          extension_type =  section_hash[:use_markdown] ? 'md' : 'html'
+          entry_data = entries.find { |entry| entry[:type] == 'documented contents' and entry[:name] == "#{child_section.internal_identifier}.#{extension_type}" }[:data]
           documented_content = DocumentedContent.create(:title => child_section.title, :body_html => entry_data)
           DocumentedItem.create(:documented_content_id => documented_content.id, :online_document_section_id => child_section.id)
         end
       end
-      #add role if is_secured
-      section.add_role(website.role) if hash[:is_secured]
-
+      
+      #handle security
+      if hash[:roles] #if this is a OnlineDocumentSection will not have roles
+        unless hash[:roles].empty? 
+          capability = section.add_capability(:view)
+          hash[:roles].each do |role_iid|
+            role = SecurityRole.find_by_internal_identifier(role_iid)
+            role.add_capability(capability)
+          end
+        end
+      end
+      
       section
     end
 
@@ -522,19 +558,4 @@ class Website < ActiveRecord::Base
   def website_role_iid
     "website_#{self.iid}_access"
   end
-
-  private
-
-  def build_menu_item_hash(menu_item)
-    {
-        :title => menu_item.title,
-        :url => menu_item.url,
-        :is_secured => menu_item.is_secured?,
-        :linked_to_item_type => menu_item.linked_to_item_type,
-        :linked_to_item_path => menu_item.linked_to_item.nil? ? nil : menu_item.linked_to_item.path,
-        :position => menu_item.position,
-        :items => menu_item.children.collect { |child| build_menu_item_hash(child) }
-    }
-  end
-
 end

data/app/models/website_nav_item.rb

@@ -25,4 +25,16 @@ class WebsiteNavItem < ActiveRecord::Base
     self.protected_with_capability?('view')
   end
   
+  def build_menu_item_hash
+    {
+        :title => self.title,
+        :url => self.url,
+        :roles => self.roles.collect(&:internal_identifier),
+        :linked_to_item_type => self.linked_to_item_type,
+        :linked_to_item_path => self.linked_to_item.nil? ? nil : self.linked_to_item.path,
+        :position => self.position,
+        :items => self.children.collect { |child| child.build_menu_item_hash }
+    }
+  end
+  
 end

data/app/models/website_section.rb

@@ -141,7 +141,7 @@ class WebsiteSection < ActiveRecord::Base
       :type => self.class.to_s,
       :in_menu => self.in_menu,
       :articles => [],
-      :is_secured => self.is_secured?,
+      :roles => self.roles.collect(&:internal_identifier),
       :path => self.path,
       :permalink => self.permalink,
       :internal_identifier => self.internal_identifier,
@@ -191,8 +191,6 @@ class WebsiteSection < ActiveRecord::Base
     self.internal_identifier = self.permalink if self.internal_identifier.blank?
   end
   
-  
-
   private
 
   def self.get_published_version(active_publication, content)