knitkit 3.0.0 → 3.2.0

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

@@ -26,6 +26,11 @@ module Knitkit
           begin
             current_user.with_capability('create', 'WebsiteHost') do
               website = Website.find(params[:website_id])
+              existing_website_host = WebsiteHost.find_by_host(params[:host])
+              if existing_website_host
+                website_name = existing_website_host.website.name
+                raise "Host #{existing_website_host.host} already used by #{website_name}"
+              end
               website_host = WebsiteHost.create(:host => params[:host])
               website.hosts << website_host
               website.save
@@ -51,6 +56,11 @@ module Knitkit
           begin
             current_user.with_capability('edit', 'WebsiteHost') do
               website_host = WebsiteHost.find(params[:id])
+              existing_website_host = WebsiteHost.find_by_host(params[:host])
+              if existing_website_host
+                website_name = existing_website_host.website.name
+                raise "Host #{existing_website_host.host} already used by #{website_name}"
+              end
               website_host.host = params[:host]
               website_host.save
 
@@ -58,6 +68,8 @@ module Knitkit
             end
           rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
             render :json => {:success => false, :message => ex.message}
+          rescue => ex
+            render :json => {:success => false, :message => ex.message}
           end
         end
 

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

@@ -11,7 +11,7 @@ module Knitkit
           if @website
             @website.website_navs.each do |website_nav|
               menu_hash = {:text => website_nav.name, :websiteNavId => website_nav.id, :canAddMenuItems => true,
-                           :iconCls => 'icon-index', :isWebsiteNav => true, :leaf => false, :children => []}
+                           :iconCls => 'icon-folder', :isWebsiteNav => true, :leaf => false, :children => []}
 
               menu_hash[:children] = website_nav.website_nav_items.positioned.map { |item| build_menu_item_hash(item) }
 
@@ -35,7 +35,7 @@ module Knitkit
                 result[:success] = true
                 result[:node] = {:text => params[:name],
                                  :websiteNavId => website_nav.id,
-                                 :iconCls => 'icon-index',
+                                 :iconCls => 'icon-folder',
                                  :canAddMenuItems => true,
                                  :isWebsiteNav => true,
                                  :leaf => false,
@@ -186,16 +186,9 @@ module Knitkit
           if current_user.has_capability?('secure', 'WebsiteNavItem') or current_user.has_capability?('unsecure', 'WebsiteNavItem')
             website_nav_item = WebsiteNavItem.find(params[:id])
 
-            roles = []
+            roles = JSON.parse(params[:security])
 
-            #get roles
-            params.each do |k, v|
-              if v == 'on'
-                roles.push(k)
-              end
-            end
-
-            if roles.empty?
+            if roles.blank? || roles.empty?
               website_nav_item.remove_capability(:view)
             else
               capability = website_nav_item.add_capability(:view)

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

@@ -115,16 +115,9 @@ module Knitkit
           if current_user.has_capability?('secure', 'WebsiteNavItem') or current_user.has_capability?('unsecure', 'WebsiteNavItem')
             website_nav_item = WebsiteNavItem.find(params[:id])
 
-            roles = []
+            roles = JSON.parse(params[:security])
 
-            #get roles
-            params.each do |k, v|
-              if v == 'on'
-                roles.push(k)
-              end
-            end
-
-            if roles.empty?
+            if roles.blank? || roles.empty?
               website_nav_item.remove_capability(:view)
             else
               capability = website_nav_item.add_capability(:view)

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

@@ -19,6 +19,7 @@ module Knitkit
                     result = {:success => false, :message => 'Blog can not be the title of a Blog'}
                   else
                     website_section = WebsiteSection.new
+                    website_section.parent_id = params[:website_section_id] if params[:website_section_id]
                     website_section.website_id = @website.id
                     website_section.in_menu = params[:in_menu] == 'yes'
                     website_section.title = params[:title]
@@ -34,8 +35,11 @@ module Knitkit
                       end
 
                       if params[:type] == "OnlineDocumentSection"
-                        documented_content = DocumentedContent.create(:title => website_section.title, :created_by => current_user, :body_html => website_section.title)
-                        DocumentedItem.create(:documented_content_id => documented_content.id, :online_document_section_id => website_section.id)
+                        documented_content = DocumentedContent.create(:title => website_section.title,
+                                                                      :created_by => current_user,
+                                                                      :body_html => website_section.title)
+                        DocumentedItem.create(:documented_content_id => documented_content.id,
+                                              :online_document_section_id => website_section.id)
                       end
 
                       website_section.update_path!
@@ -52,9 +56,11 @@ module Knitkit
                   end
                 end
               rescue => ex
-                # TODO send error notification
                 Rails.logger.error ex.message
                 Rails.logger.error ex.backtrace.join("\n")
+
+                ExceptionNotifier.notify_exception(ex) if defined? ExceptionNotifier
+
                 result = {:success => false, :message => 'Could not create Section'}
               end
 
@@ -65,17 +71,46 @@ module Knitkit
           end
         end
 
+        def copy
+          begin
+
+            @website = Website.find(params[:website_id])
+            parent_section = WebsiteSection.where('id = ?', params[:parent_section_id]).first
+            section_to_copy = WebsiteSection.find(params[:id])
+
+            new_section = section_to_copy.copy(params[:title].strip, true, true)
+
+            if parent_section
+              new_section.move_to_child_of(parent_section)
+              new_section.save
+            end
+
+            # update all children paths after all are saved.
+            new_section.self_and_descendants.each do |section|
+              section.update_path!
+            end
+
+            result = {:success => true, :parentNodeId => params[:parent_section_id], :node => build_section_hash(new_section)}
+
+          rescue => ex
+            # TODO send error notification
+            Rails.logger.error ex.message
+            Rails.logger.error ex.backtrace.join("\n")
+
+            ExceptionNotifier.notify_exception(ex) if defined? ExceptionNotifier
+
+            result = {:success => false, :message => 'Could not copy Section'}
+          end
+
+          render :json => result
+        end
+
         def delete
           begin
             ActiveRecord::Base.transaction do
               current_user.with_capability('delete', 'WebsiteSection') do
                 section = WebsiteSection.find(params[:id])
 
-                # we need to remove any content related to this section if it is an OnlineDocumentSection
-                if section.type == 'OnlineDocumentSection'
-                  section.website_section_contents.destroy_all
-                end
-
                 render :json => section.destroy ? {:success => true} : {:success => false}
               end
             end
@@ -91,16 +126,9 @@ module Knitkit
 
         def update_security
           if current_user.has_capability?('secure', 'WebsiteSection') or current_user.has_capability?('unsecure', 'WebsiteSection')
-            roles = []
+            roles = JSON.parse(params[:security])
 
-            #get roles
-            params.each do |k, v|
-              if v == 'on'
-                roles.push(k)
-              end
-            end
-
-            if roles.empty?
+            if roles.blank? || roles.empty?
               @website_section.remove_capability(:view)
             else
               capability = @website_section.add_capability(:view)
@@ -201,7 +229,9 @@ module Knitkit
 
         def available_articles_filter
           menu = []
-          websites = Website.all
+          websites = Website.joins(:website_party_roles)
+                                  .where('website_party_roles.party_id = ?', current_user.party.dba_organization.id)
+                                  .where('website_party_roles.role_type_id = ?', RoleType.iid('dba_org')).all
           all_articles = [{:name => 'All Articles', :id => 0}]
           orphaned_articles = [{:name => 'Orphaned Articles Only', :id => -1}]
 
@@ -220,7 +250,8 @@ module Knitkit
           current_articles = Article.joins(:website_section_contents).where("website_section_id = #{params[:section_id]}").all
 
           # Defaults to retrieving all articles
-          available_articles = Article.order('LOWER(contents.internal_identifier) ASC')
+          available_articles = Article.with_party_role(current_user.party.dba_organization,
+                                                       RoleType.iid('dba_org')).order('LOWER(contents.internal_identifier) ASC')
 
           # Orphaned Articles
           if !website_id.blank? and website_id.to_i == -1
@@ -244,7 +275,12 @@ module Knitkit
               "#{self.title} - #{self.path}"
             end
           end
-          render :inline => website.sections.to_json(:only => [:id], :methods => [:title_permalink])
+
+          if params[:exclude_document_sections].present?
+            render :inline => website.sections.where('type is null').to_json(:only => [:id], :methods => [:title_permalink])
+          else
+            render :inline => website.sections.to_json(:only => [:id], :methods => [:title_permalink])
+          end
         end
 
         protected

data/app/controllers/knitkit/online_document_sections_controller.rb

@@ -9,7 +9,13 @@ module Knitkit
 
     def index
       @online_document = OnlineDocumentSection.find(params[:section_id])
+    end
+
+    def show
+      @online_document = OnlineDocumentSection.find(params[:section_id])
       @online_document = nil if @online_document.id == find_root.id
+
+      render :show, :layout => false
     end
 
     def search
@@ -31,8 +37,7 @@ module Knitkit
     end
 
     def get_content
-      document_section = OnlineDocumentSection.where(:internal_identifier => params[:document_section_id])
-                                              .where(:website_id => @website.id).first
+      document_section = OnlineDocumentSection.find(params[:document_section_id])
       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?
 
@@ -56,7 +61,8 @@ module Knitkit
     end
 
     def build_document_hash(document_section)
-      {:id => document_section.internal_identifier,
+      {:id => document_section.id,
+       :internalIdentifier => document_section.internal_identifier,
        :title => document_section.title,
        :leaf => document_section.leaf,
        :iconCls => (document_section.leaf ? 'icon-documentation-document' : 'icon-documentation-multi-document'),

data/app/mailers/website_inquiry_mailer.rb

@@ -1,11 +1,19 @@
+
 class WebsiteInquiryMailer < ActionMailer::Base
+  acts_as_themed_mailer
+
+  default :from => ErpTechSvcs::Config.email_notifications_from
+
+  def inquiry(website_inquiry, dba_organization=nil)
+    # add theme paths if a website is present
+    if website_inquiry.website
+      add_theme_view_paths(website_inquiry.website)
+    end
 
-  def inquiry(website_inquiry)
     subject = "#{website_inquiry.website.title} Inquiry"
     @website_inquiry = website_inquiry
-
+    
     mail(:to => website_inquiry.website.configurations.first.get_item(ConfigurationItemType.find_by_internal_identifier('contact_us_email_address')).options.first.value,
-         :from => website_inquiry.email,
          :subject => subject,
          :content_type => 'text/html'
     )

data/app/models/content.rb

@@ -3,6 +3,8 @@ require 'will_paginate/array'
 class Content < ActiveRecord::Base
   attr_protected :created_at, :updated_at
 
+  has_party_roles
+
   extend FriendlyId
   friendly_id :title, :use => [:slugged], :slug_column => :permalink
 
@@ -14,7 +16,16 @@ class Content < ActiveRecord::Base
 
   acts_as_taggable
   acts_as_commentable
-  acts_as_versioned :table_name => :content_versions
+  acts_as_versioned :table_name => :content_versions do
+    def excerpt_html
+      if attributes['excerpt_html'].blank?
+        HTML_Truncator.truncate(attributes['body_html'], 25)
+      else
+        attributes['excerpt_html']
+      end
+    end
+  end
+
   can_be_published
 
   has_many :website_section_contents, :dependent => :destroy
@@ -45,7 +56,7 @@ class Content < ActiveRecord::Base
     end
 
     predicate = predicate.where("(UPPER(contents.title) LIKE UPPER('%#{options[:query]}%')
-                      OR UPPER(contents.excerpt_html) 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]
@@ -68,11 +79,11 @@ class Content < ActiveRecord::Base
   end
 
   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
+    Content.joins(:website_section_contents).where('website_section_id = ?', website_section_id).order("website_section_contents.position ASC, website_section_contents.created_at DESC")
   end
 
   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
+    Content.joins(:website_section_contents).where("website_section_id = ? AND contents.id IN (#{id_filter_list.join(',')})", website_section_id)
   end
 
   def self.find_published_by_section(active_publication, website_section)
@@ -103,8 +114,7 @@ class Content < ActiveRecord::Base
   end
 
   def position(website_section_id)
-    position = self.website_section_contents.find_by_website_section_id(website_section_id).position
-    position
+    self.website_section_contents.find_by_website_section_id(website_section_id).position
   end
 
   def get_comments(limit)

data/app/models/documented_item.rb

@@ -2,7 +2,9 @@ class DocumentedItem < ActiveRecord::Base
   attr_protected :created_at, :updated_at
 
   belongs_to :online_document_section
-  
+
+  before_destroy :destroy_content
+
   def content
     if content?
       Content.find(documented_content_id)
@@ -30,4 +32,13 @@ class DocumentedItem < ActiveRecord::Base
   def self.find_by_section_id( website_section_id )
     DocumentedItem.where(["online_document_section_id = ?", website_section_id]).first
   end
+
+  private
+
+  def destroy_content
+    if content?
+      Content.find(documented_content_id).destroy
+    end
+  end
+
 end

data/app/models/online_document_section.rb

@@ -8,32 +8,66 @@ class OnlineDocumentSection < WebsiteSection
   rescue
     nil
   end
-  
+
   def documented_item_published_content_html(active_publication)
     documented_item_published_content(active_publication).body_html
   rescue
     nil
   end
-  
+
+  def copy(title=nil, copy_children=false, created_by=nil)
+    new_section = OnlineDocumentSection.new
+
+    new_section.title = title.nil? ? self.title : title
+    new_section.layout = self.layout
+    new_section.in_menu = self.in_menu
+    new_section.use_markdown = self.use_markdown
+    new_section.render_base_layout = self.render_base_layout
+    new_section.website_id = self.website_id
+
+    new_section.save!
+
+    # copy documented content
+    documented_item = DocumentedItem.where('online_document_section_id = ?', self.id).first
+    documented_content = DocumentedContent.find(documented_item.documented_content_id)
+    new_documented_content = documented_content.dup
+
+    # clear out internal identifier
+    new_documented_content.internal_identifier = nil
+
+    new_documented_content.created_by = created_by
+    new_documented_content.save!
+    DocumentedItem.create!(:documented_content_id => new_documented_content.id, :online_document_section_id => new_section.id)
+
+    if copy_children
+      self.children.each do |child_section|
+        new_child_section = child_section.copy(nil, copy_children, created_by)
+        new_child_section.move_to_child_of(new_section)
+      end
+    end
+
+    new_section
+  end
+
   def build_section_hash
-    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,
-      :permalink => self.permalink,
-      :internal_identifier => self.internal_identifier,
-      :position => self.position,
-      :online_document_sections => self.children.each.map{|child| child.build_section_hash},
-      :articles => [],
-      :documented_item => {
-        :name => documented_item_content.title,
-        :display_title => documented_item_content.display_title,
-        :internal_identifier => documented_item_content.internal_identifier
-      }
+    {
+        :name => self.title,
+        :has_layout => false,
+        :use_markdown => self.use_markdown,
+        :type => self.class.to_s,
+        :in_menu => self.in_menu,
+        :path => self.path,
+        :permalink => self.permalink,
+        :internal_identifier => self.internal_identifier,
+        :position => self.position,
+        :online_document_sections => self.children.each.map { |child| child.build_section_hash },
+        :articles => [],
+        :documented_item => {
+            :name => documented_item_content.title,
+            :display_title => documented_item_content.display_title,
+            :internal_identifier => documented_item_content.internal_identifier
+        }
     }
-    section_hash
   end
+
 end