knitkit 2.0.0 → 2.0.1

data/README.md

@@ -4,3 +4,25 @@ Knitkit is an application that sits on top of the Compass AE framework that adds
 
 ![Logo](http://development.compassagile.com/sites/site-1/images/knitkit.png?1323038265)
 
+##Initializer Options
+
+- unauthorized\_url
+  - Url to redirect to when user attempts to navigate to a page they are not authorized to view.
+  - Default : '/unauthorized'
+- ignored\_prefix\_paths
+  - Array of paths for Knitkit to ignore.
+  - Default : []
+- file\_assets\_location
+  - Location, in respect to Rails.root, that you want files to upload to and created in within knikit.
+  - Default : 'knitkit_assets'
+
+### Override Initializer
+
+To override these settings simple create a knikit.rb file in your initializers and override the config options you want
+
+    Rails.application.config.knitkit.configure do |config|
+      config.unauthorized_url     = '/unauthorized'
+      config.ignored_prefix_paths = []
+      config.file_assets_location = 'knitkit_assets'
+    end
+    Rails.application.config.knitkit.configure!

data/app/controllers/knitkit/base_controller.rb

@@ -1,7 +1,7 @@
 module Knitkit
   class BaseController < ::ErpApp::ApplicationController
-    before_filter :set_website
-    before_filter :set_active_publication, :load_sections, :set_section, :except => [:view_current_publication]
+    before_filter :set_website, :clear_widget_params
+    before_filter :set_login_path, :set_active_publication, :load_sections, :set_section, :except => [:view_current_publication]
     acts_as_themed_controller :current_themes => lambda {|c| c.website.themes.active if c.website }
 
     layout 'knitkit/base'
@@ -23,15 +23,28 @@ module Knitkit
     def load_sections
       @website_sections = @website.website_sections.positioned
     end
+
+    def clear_widget_params
+      session[:widgets] = {}
+    end
     
     def set_section
       unless params[:section_id].nil?
         @website_section = WebsiteSection.find(params[:section_id])
+        if (current_user === false and !@website_section.has_access?(current_user)) and @website_section.path != @login_path
+          redirect_to @login_path
+        elsif !@website_section.has_access?(current_user)
+          redirect_to Rails.application.config.knitkit.unauthorized_url
+        end
       else
         raise "No Id set"
       end
     end
 
+    def set_login_path
+      @login_path = @website.configurations.first.get_configuration_item(ConfigurationItemType.find_by_internal_identifier('login_url')).options.first.value
+    end
+
     def set_active_publication
       @active_publication = @website.active_publication
       if !session[:website_version].blank? && !session[:website_version].empty?

data/app/controllers/knitkit/blogs_controller.rb

@@ -1,16 +1,16 @@
 module Knitkit
-  class BlogsController < ArticlesController
+  class BlogsController < BaseController
     PER_PAGE = 10
   
     def index
-      @blog = Blog.find(params[:section_id])
+      @blog = Blog.find(@website_section.id)
       params[:use_route] = 'blogs'
     
       @contents = @blog.find_published_blog_posts(@active_publication).paginate(:page => params[:page], :per_page => PER_PAGE)
     end
 
     def tag
-      @blog = Blog.find(params[:section_id])
+      @blog = Blog.find(@website_section.id)
       @tag = ActsAsTaggableOn::Tag.find(params[:tag_id])
       params[:use_route] = 'blog_tag'
 
@@ -20,7 +20,7 @@ module Knitkit
     end
 
     def show
-      @blog = Blog.find(params[:section_id])
+      @blog = Blog.find(@website_section.id)
       @published_content = @blog.find_published_blog_post(@active_publication, params[:id])
     end
   end

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

@@ -5,13 +5,14 @@ module Knitkit
         KNIT_KIT_ROOT = Knitkit::Engine.root.to_s
 
         def websites
-          websites = Website.all
+          websites = Website.order('name ASC').all
 
           tree = []
 
           websites.each do |website|
             website_hash = {
               :text => website.name,
+              :configurationId => website.configurations.first.id,
               :iconCls => 'icon-globe_disconnected',
               :id => "website_#{website.id}",
               :leaf => false,
@@ -104,17 +105,26 @@ module Knitkit
         def build_section_hash(website_section, website)
           website_section_hash = {
             :text => website_section.title,
+            :path => website_section.path,
             :siteName => website.name,
             :siteId => website.id,
             :type => website_section.type,
             :isSecured => !website_section.roles.empty?,
-            :isSection => true,
+            :isSection => website_section.is_section?,
+            :isDocument => website_section.is_document_section?,
             :inMenu => website_section.in_menu,
+            :renderWithBaseLayout => website_section.render_base_layout?,
             :hasLayout => !website_section.layout.blank?,
             :id => "section_#{website_section.id}",
             :url => "http://#{website.hosts.first.attributes['host']}#{website_section.path}",
             :internal_identifier => website_section.internal_identifier
           }
+          if (website_section.is_a?(OnlineDocumentSection) || website_section.type == 'OnlineDocumentSection')
+            document_section = OnlineDocumentSection.find(website_section.id)
+            if document_section.documented_item and document_section.documented_item_content
+              website_section_hash[:contentInfo] = document_section.documented_item_content.content_hash
+            end
+          end  
 
           if website_section.is_a?(Blog) || website_section.type == 'Blog'
             website_section_hash[:isBlog] = true
@@ -125,6 +135,10 @@ module Knitkit
             website_section_hash[:children] = website_section.positioned_children.map {|child| build_section_hash(child, website)}
             website_section_hash[:isSecured] ? website_section_hash[:iconCls] = 'icon-document_lock' : website_section_hash[:iconCls] = 'icon-document'
           end
+          
+          if (website_section.is_a?(OnlineDocumentSection) || website_section.type == 'OnlineDocumentSection')
+            website_section_hash[:iconCls] = 'icon-document_info'
+          end
 
           website_section_hash
         end

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

@@ -2,68 +2,96 @@ module Knitkit
   module ErpApp
     module Desktop
       class ArticlesController < Knitkit::ErpApp::Desktop::AppController
+        @@datetime_format = "%m/%d/%Y %l:%M%P"
 
         def new
-          result = {}
-          website_section_id = params[:section_id]
-          article = Article.new
-
-          article.tag_list = params[:tags].split(',').collect{|t| t.strip() } unless params[:tags].blank?
-          article.title = params[:title]
-          article.internal_identifier = params[:internal_identifier]
-          article.display_title = params[:display_title] == 'yes'
-          article.created_by = current_user
-
-          if article.save
-            unless website_section_id.blank?
-              website_section = WebsiteSection.find(website_section_id)
-              article.website_sections << website_section
-              article.update_content_area_and_position_by_section(website_section, params['content_area'], params['position'])
-            end
+          model = DesktopApplication.find_by_internal_identifier('knitkit')
+          begin
+            current_user.with_capability(model, 'create', 'Article') do
+              result = {}
+              website_section_id = params[:section_id]
+              article = Article.new
 
-            result[:success] = true
-          else
-            result[:success] = false
-          end
+              article.tag_list = params[:tags].split(',').collect{|t| t.strip() } unless params[:tags].blank?
+              article.title = params[:title]
+              article.internal_identifier = params[:internal_identifier]
+              article.display_title = params[:display_title] == 'yes'
+              article.created_by = current_user
 
+              if article.save
+                unless website_section_id.blank?
+                  website_section = WebsiteSection.find(website_section_id)
+                  article.website_sections << website_section
+                  article.update_content_area_and_position_by_section(website_section, params['content_area'], params['position'])
+                end
 
-          render :json => result
+                result[:success] = true
+              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
-          result = {}
-          website_section_id = params[:section_id]
-          article = Article.find(params[:id])
-
-          article.tag_list = params[:tags].split(',').collect{|t| t.strip() } unless params[:tags].blank?
-          article.title = params[:title]
-          article.internal_identifier = params[:internal_identifier]
-          article.display_title = params[:display_title] == 'yes'
-          article.updated_by = current_user
-
-          if article.save
-            unless website_section_id.blank?
-              website_section = WebsiteSection.find(website_section_id)
-              article.update_content_area_and_position_by_section(website_section, params['content_area'], params['position'])
-            end
+          model = DesktopApplication.find_by_internal_identifier('knitkit')
+          begin
+            current_user.with_capability(model, 'edit', 'Article') do
+              result = {}
+              website_section_id = params[:section_id]
+              article = Article.find(params[:id])
 
-            result[:success] = true
-          else
-            result[:success] = false
-          end
+              article.tag_list = params[:tags].split(',').collect{|t| t.strip() } unless params[:tags].blank?
+              article.title = params[:title]
+              article.internal_identifier = params[:internal_identifier]
+              article.display_title = params[:display_title] == 'yes'
+              article.updated_by = current_user
+
+              if article.save
+                unless website_section_id.blank?
+                  website_section = WebsiteSection.find(website_section_id)
+                  article.update_content_area_and_position_by_section(website_section, params['content_area'], params['position'])
+                end
+
+                result[:success] = true
+              else
+                result[:success] = false
+              end
           
-          render :json => result
+              render :json => result
+            end
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+            render :json => {:success => false, :message => ex.message}
+          end
         end
   
         def delete
-          render :json => Article.destroy(params[:id]) ? {:success => true} : {:success => false}
+          model = DesktopApplication.find_by_internal_identifier('knitkit')
+          begin
+            current_user.with_capability(model, 'delete', 'Article') do
+              render :json => Article.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 add_existing
-          website_section = WebsiteSection.find(params[:section_id])
-          website_section.contents << Article.find(params[:article_id])
+          model = DesktopApplication.find_by_internal_identifier('knitkit')
+          begin
+            current_user.with_capability(model, 'add_existing', 'Article') do
+              website_section = WebsiteSection.find(params[:section_id])
+              website_section.contents << Article.find(params[:article_id])
 
-          render :json => {:success => true}
+              render :json => {:success => true}
+            end
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+            render :json => {:success => false, :message => ex.message}
+          end
         end
 
         def existing_articles
@@ -71,15 +99,26 @@ module Knitkit
         end
 
         def get
+          website_section_id = params[:section_id]
+          section = WebsiteSection.find(website_section_id)
+
+          if section.type == 'Blog'
+            sort_default = 'created_at'
+            dir_default = 'DESC'
+          else
+            sort_default = 'title'
+            dir_default = 'ASC'
+          end            
+
           sort_hash = params[:sort].blank? ? {} : Hash.symbolize_keys(JSON.parse(params[:sort]).first)
-          sort = sort_hash[:property] || 'created_at'
-          dir  = sort_hash[:direction] || 'DESC'
+          sort = sort_hash[:property] || sort_default
+          dir  = sort_hash[:direction] || dir_default
           limit = params[:limit] || 10
           start = params[:start] || 0
 
-          website_section_id = params[:section_id]
-          articles = Article.joins("INNER JOIN website_section_contents ON website_section_contents.content_id = contents.id").where("website_section_id = #{website_section_id}").order("contents.#{sort} #{dir}").limit(limit).offset(start)
-          total_count = Article.joins("INNER JOIN website_section_contents ON website_section_contents.content_id = contents.id").where("website_section_id = #{website_section_id}").count
+          articles = Article.joins("INNER JOIN website_section_contents ON website_section_contents.content_id = contents.id").where("website_section_id = #{website_section_id}")
+          total_count = articles.count
+          articles = articles.order("#{sort} #{dir}").limit(limit).offset(start)
 
           Article.class_exec(website_section_id) do
             @@website_section_id = website_section_id
@@ -100,22 +139,28 @@ module Knitkit
             articles_hash[:internal_identifier] = a.internal_identifier
             articles_hash[:display_title] = a.display_title
             articles_hash[:position] = a.position(website_section_id)
+            articles_hash[:created_at] = a.created_at.getlocal.strftime(@@datetime_format)
+            articles_hash[:updated_at] = a.updated_at.getlocal.strftime(@@datetime_format)
             articles_array << articles_hash
           end
 
-          render :inline => "{totalCount:#{total_count},data:#{articles_array.to_json(:only => [:content_area, :id, :title, :tag_list, :body_html, :excerpt_html, :position, :internal_identifier, :display_title], :methods => [:website_section_position])}}"
+          render :inline => "{total:#{total_count},data:#{articles_array.to_json}}"
         end
       
         def all
           Article.include_root_in_json = false
           sort_hash = params[:sort].blank? ? {} : Hash.symbolize_keys(JSON.parse(params[:sort]).first)
-          sort = sort_hash[:property] || 'created_at'
-          dir  = sort_hash[:direction] || 'DESC'
-          limit = params[:limit] || 40
+          sort = sort_hash[:property] || 'title'
+          dir  = sort_hash[:direction] || 'ASC'
+          limit = params[:limit] || 20
           start = params[:start] || 0
 
-          articles = params[:iid].blank? ? Article.order( "contents.#{sort} #{dir}").limit(limit).offset(start).all : Article.where('internal_identifier like ?', "%#{params[:iid]}%").order("contents.#{sort} #{dir}").limit(limit).offset(start)
-          total_count = Article.all.count
+          articles = Article.includes(:website_section_contents)      
+          articles = articles.where( :website_section_contents => { :content_id => nil } ) if params[:show_orphaned] == 'true'
+          articles = articles.where('internal_identifier like ?', "%#{params[:iid]}%") unless params[:iid].blank?
+          articles = articles.order("contents.#{sort} #{dir}")
+          total_count = articles.count
+          articles = articles.limit(limit).offset(start)
 
           articles_array = []
           articles.each do |a|
@@ -130,11 +175,107 @@ module Knitkit
             articles_hash[:excerpt_html] = a.excerpt_html
             articles_hash[:created_by] = a.created_by.login rescue ''
             articles_hash[:last_update_by] = a.updated_by.login rescue ''
+            articles_hash[:created_at] = a.created_at.getlocal.strftime(@@datetime_format)
+            articles_hash[:updated_at] = a.updated_at.getlocal.strftime(@@datetime_format)
+
 
             articles_array << articles_hash
           end
 
-          render :inline => "{totalCount:#{total_count},data:#{articles_array.to_json(:only => [:content_area, :id, :title, :tag_list, :body_html, :excerpt_html, :sections, :internal_identifier, :display_title, :created_by, :last_update_by])}}"
+          render :inline => "{total:#{total_count},data:#{articles_array.to_json}}"
+        end
+
+        def article_attributes
+          sort_hash = params[:sort].blank? ? {} : Hash.symbolize_keys(JSON.parse(params[:sort]).first)
+          sort = sort_hash[:property] || 'created_at'
+          dir  = sort_hash[:direction] || 'DESC'
+          limit = params[:limit] || 40
+          start = params[:start] || 0
+
+          article = Article.find(params[:article_id])
+          attributes = article.attribute_values
+          attributes = attributes.slice(start.to_i, limit.to_i)
+          
+          if dir == "DESC"
+            if sort == "data_type" or sort == "description"
+              attributes = attributes.sort {|x,y| x.attribute_type.send(sort) <=> y.attribute_type.send(sort)}
+            else
+              attributes = attributes.sort {|x,y| x.send(sort) <=> y.send(sort)}
+            end
+          else
+            if sort == "data_type" or sort == "description"
+              attributes = attributes.sort {|x,y| y.attribute_type.send(sort) <=> x.attribute_type.send(sort)}
+            else
+              attributes = attributes.sort {|x,y| y.send(sort) <=> x.send(sort)}
+            end
+          end
+
+          attributes_array = []
+          attributes.each do |attribute|
+            attributes_hash = {}
+            attributes_hash[:id] = attribute.id
+            attributes_hash[:description] = attribute.attribute_type.description
+            attributes_hash[:data_type] = attribute.attribute_type.data_type
+            attributes_hash[:value] = attribute.value
+
+            attributes_array << attributes_hash
+          end
+
+          render :inline => "{data:#{attributes_array.to_json(:only => [:id, :description, :data_type, :value])}}"
+        end
+
+        def attribute_types
+          attribute_types = AttributeType.find(:all)
+          attribute_types_array = []
+          attribute_types_array << {:description => 'Search By Article', :iid => 'search_by_article'}
+          attribute_types.each do |attribute_type|
+            attribute_types_hash = {}
+            attribute_types_hash[:description] = attribute_type.description
+            attribute_types_hash[:iid] = attribute_type.internal_identifier
+
+            attribute_types_array << attribute_types_hash
+          end
+
+          render :inline => "{data:#{attribute_types_array.to_json(:only => [:description, :iid])}}"
+        end
+
+        def delete_attribute
+          render :json => AttributeValue.destroy(params[:id]) ? {:success => true} : {:success => false}
+        end
+
+        def new_attribute
+          result = {:success => true}
+          article = Article.find(params[:article_id])
+          attribute_type = AttributeType.find_by_iid_with_description(params[:description])
+
+          if attribute_type == nil
+            attribute_type = AttributeType.new
+            attribute_type.description = params[:description]
+            attribute_type.data_type = params[:data_type]
+            result[:success] = false unless attribute_type.save
+
+            attribute_value = AttributeValue.new
+            attribute_value.value = params[:value]
+
+            attribute_type.attribute_values << attribute_value
+            article.attribute_values << attribute_value
+
+            result[:success] = false unless attribute_value.save
+          else
+            if attribute_type.data_type == params[:data_type]
+              attribute_value = AttributeValue.new
+              attribute_value.value = params[:value]
+
+              attribute_type.attribute_values << attribute_value
+              article.attribute_values << attribute_value
+
+              result[:sucess] = false unless attribute_value.save
+            else
+              result[:success] = false
+            end
+          end
+
+          render :json => result
         end
 	  
       end#ArticlesController