knitkit 2.1.9 → 2.1.10

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

@@ -94,9 +94,9 @@ module Knitkit
           @root_node = nil
 
           if @context == :website
-            @root_node = File.join("public", "sites", @assets_model.iid, "images") unless @assets_model.nil?
+            @root_node = File.join(Rails.application.config.knitkit.images_path, "sites", @assets_model.iid, "images") unless @assets_model.nil?
           else
-            @root_node = File.join("public", "images")
+            @root_node = File.join(Rails.application.config.knitkit.images_base_path, 'images')
           end
 
           @root_node

data/app/controllers/knitkit/online_document_sections_controller.rb

@@ -1,16 +1,33 @@
 module Knitkit
   class OnlineDocumentSectionsController < BaseController
+    include ActionView::Helpers::SanitizeHelper
+
     layout 'knitkit/online_document_sections'
 
     before_filter :find_root
     before_filter :find_document_sections, :only => :build_tree
 
     def index
+      @online_document = OnlineDocumentSection.find(params[:section_id])
+      @online_document = nil if @online_document.id == find_root.id
+    end
+
+    def search
+      html = ''
+      results = DocumentedContent.search({:query => params[:query].strip,
+                                          :content_type => 'OnlineDocumentSection',
+                                          :parent_id => params[:section_id],
+                                          :website_id => @website.id})
+
+      DocumentedContent.build_search_results(results).each do |result|
+        html << "<p><a href=\"javascript:findShowAndExpandNode('#{result[:internal_identifier]}');\">#{result[:title]}</a><p style='border:solid 2px #CCC;padding:2px;'>#{strip_tags(result[:content].body_html[0..500])}...</p></p>"
+      end
 
+      render :json => {:success => true, :html => html}
     end
 
     def build_tree
-      render :inline => build_document_hash.to_json
+      render :json => @document_sections.collect { |document| build_document_hash(document) }
     end
 
     def get_content
@@ -27,27 +44,20 @@ module Knitkit
 
     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])
+      @root = OnlineDocumentSection.find(params[:section_id]).root
     end
 
     def find_document_sections
-      @document_sections = OnlineDocumentSection.find(id_or_node).positioned_children
+      @document_sections = find_root.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,
-                        :iconCls => (section.leaf ? 'icon-documentation-document' : 'icon-documentation-multi-document')}
-        end
-      end
+    def build_document_hash(document_section)
+      {:id => document_section.internal_identifier,
+       :title => document_section.title,
+       :leaf => document_section.leaf,
+       :iconCls => (document_section.leaf ? 'icon-documentation-document' : 'icon-documentation-multi-document'),
+       :children => document_section.positioned_children.collect { |child_document_section| build_document_hash(child_document_section) }}
     end
 
   end

data/app/models/content.rb

@@ -5,6 +5,7 @@ class Content < ActiveRecord::Base
 
   extend FriendlyId
   friendly_id :title, :use => [:slugged], :slug_column => :permalink
+
   def should_generate_new_friendly_id?
     new_record?
   end
@@ -13,7 +14,7 @@ class Content < ActiveRecord::Base
 
   acts_as_taggable
   acts_as_commentable
-  acts_as_versioned  :table_name => :content_versions
+  acts_as_versioned :table_name => :content_versions
   can_be_published
   has_relational_dynamic_attributes
 
@@ -21,53 +22,62 @@ class Content < ActiveRecord::Base
   has_many :website_sections, :through => :website_section_contents
   belongs_to :created_by, :class_name => "User"
   belongs_to :updated_by, :class_name => "User"
-    
+
   validates :type, :presence => {:message => 'Type cannot be blank'}
   validates_uniqueness_of :internal_identifier, :case_sensitive => false
 
   def self.search(options = {})
-    if options[:section_unique_name].nil? or options[:section_unique_name].empty?
-      section_scope = ''
-    else
-      section_scope = "website_sections.internal_identifier = '#{options[:section_unique_name]}' AND"
+    predicate = Content.includes([:website_sections])
+
+    if options[:section_unique_name]
+      predicate = predicate.where("website_sections.internal_identifier = ?", options[:section_unique_name])
     end
 
-    if options[:content_type].nil? or options[:content_type].empty?
-      content_type_scope = ''
-    else
-      content_type_scope = "website_sections.type = '#{options[:content_type]}' AND"
+    if options[:parent_id]
+      predicate = predicate.where("website_sections.id" => WebsiteSection.find(options[:parent_id]).self_and_descendants.collect(&:id))
     end
- 
-    Content.includes([:website_sections]).where("#{content_type_scope} #{section_scope} 
-                    website_sections.website_id = #{options[:website_id]} AND
-                    (UPPER(contents.title) LIKE UPPER('%#{options[:query]}%') 
+
+    if options[:content_type]
+      predicate = predicate.where("website_sections.type = ?", options[:content_type])
+    end
+
+    if options[:website_id]
+      predicate = predicate.where("website_sections.website_id = ?", options[:website_id])
+    end
+
+    predicate = predicate.where("(UPPER(contents.title) LIKE UPPER('%#{options[:query]}%')
                       OR UPPER(contents.excerpt_html) LIKE UPPER('%#{options[:query]}%') 
-                      OR UPPER(contents.body_html) LIKE UPPER('%#{options[:query]}%') )").order("contents.created_at DESC").paginate(:page => options[:page], :per_page => options[:per_page])
+                      OR UPPER(contents.body_html) LIKE UPPER('%#{options[:query]}%') )").order("contents.created_at DESC")
+    if options[:page]
+      predicate.paginate(:page => options[:page], :per_page => options[:per_page])
+    else
+      predicate.all
+    end
   end
 
-  def self.do_search(options = {})    
+  def self.do_search(options = {})
     @results = Content.search(options)
 
-    @search_results = build_search_results(@results) 
-    
+    @search_results = build_search_results(@results)
+
     @page_results = WillPaginate::Collection.create(options[:page], options[:per_page], @results.total_entries) do |pager|
       pager.replace(@search_results)
     end
-    
-    return @page_results
+
+    @page_results
   end
-      
-  def self.find_by_section_id( website_section_id )
+
+  def self.find_by_section_id(website_section_id)
     Content.joins(:website_section_contents).where('website_section_id = ?', website_section_id).order("website_section_contents.position ASC, website_section_contents.created_at DESC").all
   end
 
-  def self.find_by_section_id_filtered_by_id( website_section_id, id_filter_list )
+  def self.find_by_section_id_filtered_by_id(website_section_id, id_filter_list)
     Content.joins(:website_section_contents).where("website_section_id = ? AND contents.id IN (#{id_filter_list.join(',')})", website_section_id).all
   end
 
   def self.find_published_by_section(active_publication, website_section)
     published_content = []
-    contents = self.find_by_section_id( website_section.id )
+    contents = self.find_by_section_id(website_section.id)
     contents.each do |content|
       content = get_published_version(active_publication, content)
       published_content << content unless content.nil?
@@ -77,9 +87,9 @@ class Content < ActiveRecord::Base
   end
 
   def self.find_published_by_section_with_tag(active_publication, website_section, tag)
-    published_content = []    
-    id_filter_list = self.tagged_with(tag.name).collect{|t| t.id }    
-    contents = self.find_by_section_id_filtered_by_id( website_section.id, id_filter_list )
+    published_content = []
+    id_filter_list = self.tagged_with(tag.name).collect { |t| t.id }
+    contents = self.find_by_section_id_filtered_by_id(website_section.id, id_filter_list)
     contents.each do |content|
       content = get_published_version(active_publication, content)
       published_content << content unless content.nil?
@@ -88,11 +98,11 @@ class Content < ActiveRecord::Base
     published_content
   end
 
-  def find_website_sections_by_site_id( website_id )
-    self.website_sections.where('website_id = ?',website_id).all
+  def find_website_sections_by_site_id(website_id)
+    self.website_sections.where('website_id = ?', website_id).all
   end
 
-  def position( website_section_id )
+  def position(website_section_id)
     position = self.website_section_contents.find_by_website_section_id(website_section_id).position
     position
   end
@@ -102,7 +112,7 @@ class Content < ActiveRecord::Base
   end
 
   def update_content_area_and_position_by_section(section, content_area, position)
-    website_section_content = WebsiteSectionContent.where('content_id = ? and website_section_id = ?',self.id, section.id).first
+    website_section_content = WebsiteSectionContent.where('content_id = ? and website_section_id = ?', self.id, section.id).first
     unless website_section_content.nil?
       website_section_content.content_area = content_area
       website_section_content.position = position
@@ -112,16 +122,16 @@ class Content < ActiveRecord::Base
 
   def content_area_by_website_section(section)
     content_area = nil
-    unless WebsiteSectionContent.where('content_id = ? and website_section_id = ?',self.id, section.id).first.nil?
-      content_area = WebsiteSectionContent.where('content_id = ? and website_section_id = ?',self.id, section.id).first.content_area
+    unless WebsiteSectionContent.where('content_id = ? and website_section_id = ?', self.id, section.id).first.nil?
+      content_area = WebsiteSectionContent.where('content_id = ? and website_section_id = ?', self.id, section.id).first.content_area
     end
     content_area
   end
 
   def position_by_website_section(section)
     position = nil
-    unless WebsiteSectionContent.where('content_id = ? and website_section_id = ?',self.id, section.id).first.nil?
-      position = WebsiteSectionContent.where('content_id = ? and website_section_id = ?',self.id, section.id).first.position
+    unless WebsiteSectionContent.where('content_id = ? and website_section_id = ?', self.id, section.id).first.nil?
+      position = WebsiteSectionContent.where('content_id = ? and website_section_id = ?', self.id, section.id).first.position
     end
     position
   end
@@ -129,18 +139,18 @@ class Content < ActiveRecord::Base
   def assign_attribute_on_save
     super
 
-    Article.find_by_internal_identifier(self.internal_identifier) ? attribute_type_description = "updated_by_role"  : attribute_type_description = "created_by_role"
+    Article.find_by_internal_identifier(self.internal_identifier) ? attribute_type_description = "updated_by_role" : attribute_type_description = "created_by_role"
 
     if attribute_type_description == "created_by_role"
       user = self.created_by
     else
-      user = User.find(self.versions.sort_by {|version| version.version}.reverse[0].created_by_id)
+      user = User.find(self.versions.sort_by { |version| version.version }.reverse[0].created_by_id)
     end
-    
+
     if user
       #keep only the attributes related to the most recent change for each attribute_type
       self.destroy_values_of_type attribute_type_description
-    
+
       attribute_type = AttributeType.find_by_internal_identifier(attribute_type_description)
       attribute_type = AttributeType.create(:description => attribute_type_description, :data_type => "Text") unless attribute_type
 
@@ -156,9 +166,9 @@ class Content < ActiveRecord::Base
   def is_published?
     !PublishedElement.where('published_element_record_id = ? and published_element_record_type = ? and published_elements.version = ?', self.id, 'Content', self.version).first.nil?
   end
-  
+
   protected
-  
+
   def self.build_search_results(results)
     # and if it is a blog get the article link and title
     results_array = []
@@ -178,7 +188,7 @@ class Content < ActiveRecord::Base
 
       results_array << results_hash
     end
-    
+
     results_array
   end
 

data/app/models/documented_content.rb

@@ -9,11 +9,11 @@ class DocumentedContent < Content
   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}
   end
-  
+
   def self.find_published_by_section(active_publication, website_section)
     published_content = []
     documented_item = DocumentedItem.where(["online_document_section_id = ?", website_section.id]).first
@@ -25,5 +25,59 @@ class DocumentedContent < Content
 
     published_content.first
   end
-  
+
+  def self.search(options = {})
+    predicate = self.joins('inner join documented_items on documented_items.documented_content_id = contents.id')
+    .joins('inner join website_sections on website_sections.id = documented_items.online_document_section_id')
+
+    if options[:section_unique_name]
+      predicate = predicate.where("website_sections.internal_identifier = ?", options[:section_unique_name])
+    end
+
+    if options[:parent_id]
+      predicate = predicate.where("website_sections.id" => WebsiteSection.find(options[:parent_id]).descendants.collect(&:id))
+    end
+
+    if options[:content_type]
+      predicate = predicate.where("website_sections.type = ?", options[:content_type])
+    end
+
+    if options[:website_id]
+      predicate = predicate.where("website_sections.website_id = ?", options[:website_id])
+    end
+
+    predicate = predicate.where("(UPPER(contents.title) LIKE UPPER('%#{options[:query]}%')
+                      OR UPPER(contents.excerpt_html) LIKE UPPER('%#{options[:query]}%')
+                      OR UPPER(contents.body_html) LIKE UPPER('%#{options[:query]}%') )").order("contents.created_at DESC")
+    if options[:page]
+      predicate.paginate(:page => options[:page], :per_page => options[:per_page])
+    else
+      predicate.all
+    end
+  end
+
+  def self.build_search_results(results)
+    # and if it is a blog get the article link and title
+    results_array = []
+    results.each do |content|
+      section = DocumentedItem.find_by_documented_content_id(content.id).online_document_section
+
+      results_hash = {}
+      results_hash[:internal_identifier] = section.internal_identifier
+      if section.attributes['type'] == 'Blog'
+        results_hash[:link] = section.path + '/' + content.permalink
+        results_hash[:title] = content.title
+      else
+        results_hash[:link] = section.path
+        results_hash[:title] = section.title
+      end
+      results_hash[:section] = section
+      results_hash[:content] = content
+
+      results_array << results_hash
+    end
+
+    results_array
+  end
+
 end

data/app/models/online_document_section.rb

@@ -2,7 +2,7 @@ class OnlineDocumentSection < WebsiteSection
   has_one :documented_item, :dependent => :destroy
   delegate :content, :to => :documented_item, :prefix => true
   delegate :published_content, :to => :documented_item, :prefix => true
-  
+
   def documented_item_content_html
     documented_item_content.body_html
   rescue