knitkit 2.1.15 → 3.0.0

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

@@ -0,0 +1,147 @@
+module Knitkit
+  module ErpApp
+    module Desktop
+      class WebsiteNavItemController < Knitkit::ErpApp::Desktop::AppController
+
+        def create
+          begin
+            current_user.with_capability('create', 'WebsiteNavItem') do
+              result = {}
+              klass = params[:klass].constantize
+              parent = klass.find(params[:parent_id])
+              website_nav = parent.is_a?(WebsiteNav) ? parent : parent.website_nav
+              website_nav_item = WebsiteNavItem.new(:title => params[:title])
+
+              url = params[:url]
+              if params[:link_to] != 'url'
+                #user wants to see Section so this is needed
+                params[:link_to] = 'WebsiteSection' if params[:link_to] == 'website_section'
+
+                #get link to item can be Article or Section
+                linked_to_id = params["#{params[:link_to].underscore}_id".to_sym]
+                link_to_item = params[:link_to].constantize.find(linked_to_id)
+                #setup link
+                website_nav_item.url = '/' + link_to_item.permalink
+                website_nav_item.linked_to_item = link_to_item
+                url = "http://#{website_nav.website.hosts.first.host}/" + link_to_item.permalink
+              else
+                website_nav_item.url = url
+              end
+
+              if website_nav_item.save
+                if parent.is_a?(WebsiteNav)
+                  parent.website_nav_items << website_nav_item
+                else
+                  website_nav_item.move_to_child_of(parent)
+                end
+
+                result[:success] = true
+                result[:node] = {:text => params[:title],
+                                 :linkToType => params[:link_to].underscore,
+                                 :linkedToId => linked_to_id,
+                                 :websiteNavId => website_nav.id,
+                                 :url => url,
+                                 :isSecure => false,
+                                 :roles => [],
+                                 :canAddMenuItems => true,
+                                 :websiteNavItemId => website_nav_item.id,
+                                 :iconCls => 'icon-document',
+                                 :isWebsiteNavItem => true,
+                                 :leaf => false,
+                                 :children => []}
+              else
+                result[:success] = false
+              end
+
+              render :json => result
+            end
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
+            render :json => {:success => false, :message => ex.message}
+          end
+        end
+
+        def update
+          begin
+            current_user.with_capability('edit', 'WebsiteNavItem') do
+              result = {}
+              website_nav_item = WebsiteNavItem.find(params[:id])
+              website_nav_item.title = params[:title]
+
+              url = params[:url]
+              linked_to_id = nil
+              if (params[:link_to] != 'url')
+                #user wants to see Section so this is needed
+                params[:link_to] = 'WebsiteSection' if params[:link_to] == 'website_section'
+
+                #get link to item can be Article or Section
+                linked_to_id = params["#{params[:link_to].underscore}_id".to_sym]
+                link_to_item = params[:link_to].constantize.find(linked_to_id)
+                #setup link
+                website_nav_item.url = '/' + link_to_item.permalink
+                website_nav_item.linked_to_item = link_to_item
+                url = "http://#{website_nav_item.website_nav.website.hosts.first.host}/" + link_to_item.permalink
+              else
+                website_nav_item.url = url
+              end
+
+              if website_nav_item.save
+                result[:success] = true
+                result[:title] = params[:title]
+                result[:linkedToId] = linked_to_id
+                result[:linkToType] = params[:link_to].underscore
+                result[:url] = url
+              else
+                result[:success] = false
+              end
+
+              render :json => result
+            end
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
+            render :json => {:success => false, :message => ex.message}
+          end
+        end
+
+        def destroy
+          begin
+            current_user.with_capability('delete', 'WebsiteNavItem') do
+              render :json => (WebsiteNavItem.destroy(params[:id]) ? {:success => true} : {:success => false})
+            end
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
+            render :json => {:success => false, :message => ex.message}
+          end
+        end
+
+        def update_security
+          if current_user.has_capability?('secure', 'WebsiteNavItem') or current_user.has_capability?('unsecure', 'WebsiteNavItem')
+            website_nav_item = WebsiteNavItem.find(params[:id])
+
+            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(capability)
+              end
+            end
+
+            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
+        end
+
+      end # WebsiteNavItemController
+    end # Desktop
+  end # ErpApp
+end # Knitkit

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

@@ -6,43 +6,56 @@ module Knitkit
 
         def new
           begin
-            current_user.with_capability('create', 'WebsiteSection') do
-              website = Website.find(params[:website_id])
-
-              if params[:title].to_s.downcase == 'blog' && params[:type] == 'Blog'
-                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'
-                website_section.type = params[:type] unless params[:type] == 'Page'
-                website_section.internal_identifier = params[:internal_identifier]
-                website_section.position = 0 # explicitly set position null, MS SQL doesn't always honor column default
-
-                if website_section.save
-                  if params[:website_section_id]
-                    parent_website_section = WebsiteSection.find(params[:website_section_id])
-                    website_section.move_to_child_of(parent_website_section)
-                  end
+            result = {success: false}
 
-                  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)
-                  end
+            current_user.with_capability('create', 'WebsiteSection') do
+              begin
+                ActiveRecord::Base.transaction do
+
+                  @website = Website.find(params[:website_id])
+                  @website_primary_host = @website.nil? ? nil : @website.config_value('primary_host')
+
+                  if params[:title].to_s.downcase == 'blog' && params[:type] == 'Blog'
+                    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'
+                    website_section.type = params[:type] unless params[:type] == 'Page'
+                    website_section.internal_identifier = params[:internal_identifier]
+                    website_section.position = 0 # explicitly set position null, MS SQL doesn't always honor column default
+
+                    if website_section.save
+                      if params[:website_section_id]
+                        parent_website_section = WebsiteSection.find(params[:website_section_id])
+                        website_section.move_to_child_of(parent_website_section)
+                      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)
+                      end
+
+                      website_section.update_path!
+                      result = {:success => true, :node => build_section_hash(website_section)}
+                    else
+                      message = "<ul>"
+                      website_section.errors.collect do |e, m|
+                        message << "<li>#{e} #{m}</li>"
+                      end
+                      message << "</ul>"
+                      result = {:success => false, :message => message}
+                    end
 
-                  website_section.update_path!
-                  result = {:success => true, :node => build_section_hash(website_section, website_section.website)}
-                else
-                  message = "<ul>"
-                  website_section.errors.collect do |e, m|
-                    message << "<li>#{e} #{m}</li>"
                   end
-                  message << "</ul>"
-                  result = {:success => false, :message => message}
                 end
-
+              rescue => ex
+                # TODO send error notification
+                Rails.logger.error ex.message
+                Rails.logger.error ex.backtrace.join("\n")
+                result = {:success => false, :message => 'Could not create Section'}
               end
 
               render :json => result
@@ -54,8 +67,17 @@ module Knitkit
 
         def delete
           begin
-            current_user.with_capability('delete', 'WebsiteSection') do
-              render :json => WebsiteSection.destroy(params[:id]) ? {:success => true} : {:success => false}
+            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
           rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
             render :json => {:success => false, :message => ex.message}
@@ -89,7 +111,7 @@ module Knitkit
               end
             end
 
-            render :json => {:success => true, :secured => @website_section.is_secured?, :roles => @website_section.roles.collect{|item| item.internal_identifier}}
+            render :json => {:success => true, :secured => @website_section.is_secured?, :roles => @website_section.roles.collect { |item| item.internal_identifier }}
           else
             render :json => {:success => false, :message => "User does not have capability."}
           end
@@ -103,20 +125,25 @@ 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?
+              #TODO this should probably be moved into the view
+              if @website_section.altered?
+                website = @website_section.website
+                if @website_section.save
+                  @website_section.publish(website, 'Auto Publish', @website_section.version, current_user) if website.publish_on_save?
 
-                render :json => {:success => true}
+                  render :json => {:success => true}
+                else
+                  render :json => {:success => false}
+                end
               else
-                render :json => {:success => false}
+                render :json => {:success => true}
               end
+
             end
           rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
             render :json => {:success => false, :message => ex.message}
@@ -151,9 +178,18 @@ module Knitkit
               unless result
                 website = @website_section.website
                 @website_section.layout = params[:content]
-                saved = @website_section.save
-                @website_section.publish(website, 'Auto Publish', @website_section.version, current_user) if saved and website.publish_on_save?
-                render :json => saved ? {:success => true} : {:success => false}
+
+                #TODO this should probably be moved into the view
+                if @website_section.altered?
+                  saved = @website_section.save
+                  @website_section.publish(website, 'Auto Publish', @website_section.version, current_user) if saved and website.publish_on_save?
+
+                  render :json => saved ? {:success => true} : {:success => false}
+                else
+
+                  render :json => {:success => true}
+                end
+
               else
                 render :json => {:success => false, :message => result}
               end

data/app/controllers/knitkit/mobile_controller.rb

@@ -0,0 +1,15 @@
+module Knitkit
+  class MobileController < ::ErpApp::ApplicationController
+
+    before_filter :set_website
+
+    def index
+    end
+
+    protected
+    def set_website
+      @website = Website.find_by_host(request.host_with_port)
+    end
+    
+  end
+end

data/app/controllers/knitkit/online_document_sections_controller.rb

@@ -31,7 +31,8 @@ module Knitkit
     end
 
     def get_content
-      document_section = OnlineDocumentSection.where(:internal_identifier => params[:document_section_id]).first
+      document_section = OnlineDocumentSection.where(:internal_identifier => params[:document_section_id])
+                                              .where(:website_id => @website.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?
 

data/app/controllers/knitkit/unauthorized_controller.rb

@@ -2,7 +2,6 @@ module Knitkit
   class UnauthorizedController < BaseController
 
     def index
-      @current_user = nil
     end
 
     #no section to set

data/app/controllers/knitkit/website_sections_controller.rb

@@ -2,14 +2,17 @@ module Knitkit
   class WebsiteSectionsController < BaseController
 
     def index
-      @current_user = current_user
       @contents = Article.find_published_by_section(@active_publication, @website_section)
       layout = @website_section.get_published_layout(@active_publication)
-      unless layout.nil?
-        @website_section.render_base_layout? ? (render :inline => layout, :layout => 'knitkit/base') : (render :inline => layout)
-      else
+
+      if params[:is_mobile]
+        layout.nil? ? (render :layout => false) : (render :inline => layout, :layout => false)
+      elsif layout.nil?
         @website_section.render_base_layout? ? (render) : (render :layout => false)
+      else
+        @website_section.render_base_layout? ? (render :inline => layout, :layout => 'knitkit/base') : (render :inline => layout)
       end
+
     end
     
   end

data/app/mailers/website_inquiry_mailer.rb

@@ -1,13 +1,14 @@
 class WebsiteInquiryMailer < ActionMailer::Base
 
-  def inquiry(website_inquiry, subject='')
-    subject = "#{website_inquiry.website.title} Inquiry" if subject.blank?
+  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.data.dyn_email,
-          :subject => subject,
-          :content_type => 'text/plain'
-         )
+
+    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'
+    )
   end
 end
 

data/app/models/content.rb

@@ -16,7 +16,6 @@ class Content < ActiveRecord::Base
   acts_as_commentable
   acts_as_versioned :table_name => :content_versions
   can_be_published
-  has_relational_dynamic_attributes
 
   has_many :website_section_contents, :dependent => :destroy
   has_many :website_sections, :through => :website_section_contents
@@ -119,6 +118,8 @@ class Content < ActiveRecord::Base
       website_section_content.position = position
       website_section_content.save
     end
+
+    website_section_content
   end
 
   def content_area_by_website_section(section)
@@ -168,6 +169,10 @@ class Content < ActiveRecord::Base
     !PublishedElement.where('published_element_record_id = ? and published_element_record_type = ? and published_elements.version = ?', self.id, 'Content', self.version).first.nil?
   end
 
+  def pretty_tag_list
+    self.tag_list.join(", ")
+  end
+
   protected
 
   def self.build_search_results(results)
@@ -198,7 +203,11 @@ class Content < ActiveRecord::Base
   def self.get_published_version(active_publication, content)
     content_version = nil
     published_website_id = active_publication.id
-    published_element = PublishedElement.includes([:published_website]).where('published_websites.id = ? and published_element_record_id = ? and published_element_record_type = ?', published_website_id, content.id, 'Content').first
+    published_element = PublishedElement.includes([:published_website])
+                                        .where('published_websites.id = ?', published_website_id)
+                                        .where('published_element_record_id = ?', content.id)
+                                        .where('published_element_record_type = ?', 'Content').first
+
     unless published_element.nil?
       content_version = Content::Version.where('version = ? and content_id = ?', published_element.version, published_element.published_element_record_id).first
     end

data/app/models/document.rb

@@ -1,27 +1,12 @@
 class Document < ActiveRecord::Base
   attr_protected :created_at, :updated_at
 
-  DOCUMENT_DYNAMIC_ATTRIBUTE_PREFIX = 'dyn_'
-  
-  has_dynamic_attributes :dynamic_attribute_prefix => DOCUMENT_DYNAMIC_ATTRIBUTE_PREFIX, :destroy_dynamic_attribute_for_nil => false
+  # serialize custom attributes
+  is_json :custom_fields
   
   has_file_assets
 
   belongs_to :document_record, :polymorphic => true
   belongs_to :document_type
   
-  class << self
-    def add_dyn_prefix(field)
-      "#{DOCUMENT_DYNAMIC_ATTRIBUTE_PREFIX}#{field}"
-    end
-    
-    def remove_dyn_prefix(field)
-      field.gsub(DOCUMENT_DYNAMIC_ATTRIBUTE_PREFIX, '')
-    end
-  end
-  
-  def set_dyn_attribute(field, value)
-    self.send("#{Document.add_dyn_prefix(field)}=", value)
-  end
-  
 end