knitkit 2.1.15 → 3.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 35f3ceea0007821006cbca76128f3c66aea5eff0
+  data.tar.gz: 391fe91b89b348a7700d28f9764c959a8028d8d0
+SHA512:
+  metadata.gz: 21e28ca0baca8b9f90e040a47ffa9a68f6279b3b3970b3c50463894933aaa830b622140c7146175f5b9369aee14b526778b1e5fd9e6c2b8414d3316b04140ffc
+  data.tar.gz: 73a2a52a625f305e5382ed4131e471839e81ce5fd844e1cc7ea8aad4b9fbb5e5d0e3dea631f298e5f870f3e01231c4ddf9eb6457a9c3d5a54a3519090f5fc8f3

data/app/controllers/knitkit/base_controller.rb

@@ -41,7 +41,7 @@ module Knitkit
           end
         end
       else
-        raise "No Id set"
+        raise ActionController::RoutingError.new('Not Found')
       end
     end
 

data/app/controllers/knitkit/comments_controller.rb

@@ -7,12 +7,17 @@ module Knitkit
 
       @comment = content.add_comment({:commentor_name => user.party.description, :email => user.email, :comment => comment})
 
-      render :text => (@comment.valid? ? '<div class="sexynotice">Comment pending approval.</div>' : '<div class="sexynotice">Error. Comment cannot be blank.</div>')
+      if @comment.valid?
+        render :json => {:success => true, :message => 'Comment pending approval'}
+      else
+        render :json => {:success => false, :message => 'Error. Comment cannot be blank'}
+      end
     end
 
     #no section to set
     def set_section
-      return false
+      false
     end
+
   end
 end

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

@@ -5,66 +5,18 @@ module Knitkit
         KNIT_KIT_ROOT = Knitkit::Engine.root.to_s
 
         def available_roles
-          render :json => {:success => true, :availableRoles => SecurityRole.order('description ASC').all.collect{|role| role.to_hash(:only => [:internal_identifier, :description])}}
+          render :json => {:success => true, :availableRoles => SecurityRole.order('description ASC').all.collect { |role| role.to_hash(:only => [:internal_identifier, :description]) }}
         end
 
-        def websites
-          websites = Website.order('name ASC').all
-
-          tree = []
-          websites.each do |website|
-            @website_primary_host = website.config_value('primary_host')
-
-            website_hash = {
-              :text => website.name,
-              :configurationId => website.configurations.first.id,
-              :iconCls => 'icon-globe_disconnected',
-              :id => "website_#{website.id}",
-              :leaf => false,
-              :url => "http://#{@website_primary_host}",
-              :name => website.name,
-              :title => website.title,
-              :subtitle => website.subtitle,
-              :isWebsite => true,
-              :siteName => website.name,
-              :children => []
-            }
-
-            #handle hosts
-            hosts_hash = {:text => 'Hosts', :iconCls => 'icon-gear', :isHostRoot => true, :websiteId => website.id, :leaf => false, :children => []}
-            website.hosts.each do |website_host|
-              hosts_hash[:children] << {:text => website_host.attributes['host'], :websiteHostId => website_host.id, :host => website_host.attributes['host'], :iconCls => 'icon-globe', :url => "http://#{website_host.attributes['host']}", :isHost => true, :leaf => true, :children => []}
-            end
-
-            website_hash[:children] << hosts_hash
-
-            #handle sections
-            sections_hash = {:text => 'Sections', :isSectionRoot => true, :websiteId => website.id, :iconCls => 'icon-content', :leaf => false, :children => []}
-            website.website_sections.positioned.each do |website_section|
-              sections_hash[:children] << build_section_hash(website_section, website)
-            end
-
-            website_hash[:children] << sections_hash
-
-            #handle menus
-            menus_hash = {:text => 'Menus', :iconCls => 'icon-content', :isMenuRoot => true, :websiteId => website.id, :leaf => false, :children => []}
-            website.website_navs.each do |website_nav|
-              menu_hash = {:text => website_nav.name, :websiteNavId => website_nav.id, :websiteId => website.id, :canAddMenuItems => true, :iconCls => 'icon-index', :isWebsiteNav => true, :leaf => false, :children => []}
-              menu_hash[:children] = website_nav.website_nav_items.positioned.map{|item|build_menu_item_hash(website, item)}
-              menus_hash[:children] << menu_hash
-            end
-
-            website_hash[:children] << menus_hash
+        protected
 
-            #added website to main tree
-            tree << website_hash
+        def set_website
+          if params[:website_id]
+            @website = Website.find(params[:website_id])
+            @website_primary_host = @website.nil? ? nil : @website.config_value('primary_host')
           end
-
-          render :json => tree
         end
 
-        protected
-
         def page
           offset = params[:start].to_f
           offset > 0 ? ((offset / params[:limit].to_f).to_i + 1) : 1
@@ -74,7 +26,7 @@ module Knitkit
           params[:limit].nil? ? 20 : params[:limit].to_i
         end
 
-        def build_menu_item_hash(website, item)
+        def build_menu_item_hash(item)
           url = item.url
           linked_to_item_id = nil
           link_to_type = 'url'
@@ -85,69 +37,97 @@ module Knitkit
           end
 
           menu_item_hash = {
-            :text => item.title,
-            :linkToType => link_to_type,
-            :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,
-            :iconCls => item.is_secured? ? 'icon-document_lock' : 'icon-document',
-            :isWebsiteNavItem => true,
-            :leaf => false
+              :text => item.title,
+              :linkToType => link_to_type,
+              :canAddMenuItems => true,
+              :isSecured => item.is_secured?,
+              :roles => item.roles.collect { |item| item.internal_identifier },
+              :linkedToId => linked_to_item_id,
+              :websiteNavItemId => item.id,
+              :url => url,
+              :iconCls => item.is_secured? ? 'icon-document_lock' : 'icon-document',
+              :isWebsiteNavItem => true,
+              :leaf => false
           }
 
-          menu_item_hash[:children] = item.positioned_children.map{ |child| build_menu_item_hash(website, child)}
+          menu_item_hash[:children] = item.positioned_children.map { |child| build_menu_item_hash(child) }
 
           menu_item_hash
         end
 
-        def build_section_hash(website_section, website)
+        def build_section_hash(website_section)
           website_section_hash = {
-            :text => website_section.title,
-            :path => website_section.path,
-            :siteName => website.name,
-            :siteId => website.id,
-            :type => website_section.type,
-            :isSecured => website_section.is_secured?,
-            :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?,
-            :id => "section_#{website_section.id}",
-            :url => "http://#{@website_primary_host}#{website_section.path}",
-            :internal_identifier => website_section.internal_identifier
+              recordType: 'WebsiteSection',
+              recordId: website_section.id,
+              :text => website_section.title,
+              :path => website_section.path,
+              :siteName => @website.name,
+              :siteId => @website.id,
+              :type => website_section.type,
+              :isSecured => website_section.is_secured?,
+              :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?,
+              :id => "section_#{website_section.id}",
+              :url => "http://#{@website_primary_host}#{website_section.path}",
+              :internal_identifier => website_section.internal_identifier
+
           }
-          if (website_section.is_a?(OnlineDocumentSection) || website_section.type == 'OnlineDocumentSection')
+
+          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  
+          end
 
-          if website_section.is_a?(Blog) || website_section.type == 'Blog'
+          if website_section.is_blog?
+            website_section_hash[:objectType] = 'Blog'
             website_section_hash[:isBlog] = true
             website_section_hash[:iconCls] = 'icon-blog'
-            website_section_hash[:leaf] = true
+            website_section_hash[:leaf] = false
           else
             website_section_hash[:leaf] = false
-            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'
+            website_section_hash[:isSecured] ? website_section_hash[:iconCls] = 'icon-section_lock' : website_section_hash[:iconCls] = 'icon-section'
           end
-          
-          if (website_section.is_a?(OnlineDocumentSection) || website_section.type == 'OnlineDocumentSection')
+
+          if website_section.is_a?(OnlineDocumentSection) || website_section.type == 'OnlineDocumentSection'
             website_section_hash[:iconCls] = 'icon-document_info'
           end
 
           website_section_hash
         end
-        
-      end#AppController
-    end#Desktop
-  end#ErpApp
-end#Knitkit
+
+        def build_article_hash(website_section_content, website, can_edit_excerpt=false)
+          website_section = website_section_content.website_section
+          content = website_section_content.content
+
+          {
+              recordType: 'Article',
+              recordId: website_section_content.id,
+              :objectType => "Article",
+              :id => content.id,
+              :siteId => website.id,
+              :content_area => website_section_content.content_area,
+              :parentItemId => website_section.id,
+              :canEditExcerpt => can_edit_excerpt,
+              :tag_list => content.tags.join(', '),
+              :text => content.title,
+              :position => content.position(website_section.id),
+              :display_title => content.display_title,
+              :internal_identifier => content.internal_identifier,
+              :iconCls => 'icon-article',
+              :created_at => content.created_at,
+              :updated_at => content.updated_at,
+              :leaf => true
+          }
+        end
+
+      end #AppController
+    end #Desktop
+  end #ErpApp
+end #Knitkit

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

@@ -5,34 +5,47 @@ module Knitkit
         @@datetime_format = "%m/%d/%Y %l:%M%P"
 
         def new
-          begin
-            current_user.with_capability('create', 'Content') do
-              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'])
+          ActiveRecord::Base.transaction do
+            begin
+              current_user.with_capability('create', 'Content') do
+                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
+                  result[:node] = if website_section_id.blank?
+                                    {:text => params[:title],
+                                     :id => article.id,
+                                     :objectType => 'Article',
+                                     :parentItemId => params[:section_id],
+                                     :siteId => nil,
+                                     :iconCls => 'x-column-header-wysiwyg',
+                                     :leaf => true
+                                    }
+                                  else
+                                    website_section = WebsiteSection.find(website_section_id)
+                                    article.website_sections << website_section
+                                    website_section_content = article.update_content_area_and_position_by_section(website_section, params['content_area'], params['position'])
+
+                                    build_article_hash(website_section_content, website_section.website, website_section.is_blog?)
+                                  end
+
+                  result[:success] = true
+                else
+                  result[:success] = false
                 end
 
-                result[:success] = true
-              else
-                result[:success] = false
+                render :json => result
               end
-
-              render :json => result
+            rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
+              render :json => {:success => false, :message => ex.message}
             end
-          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
-            render :json => {:success => false, :message => ex.message}
           end
         end
 
@@ -43,7 +56,7 @@ module Knitkit
               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.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'
@@ -62,7 +75,7 @@ module Knitkit
 
               render :json => result
             end
-          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
             render :json => {:success => false, :message => ex.message}
           end
         end
@@ -72,7 +85,7 @@ module Knitkit
             current_user.with_capability('delete', 'Content') do
               render :json => Article.destroy(params[:id]) ? {:success => true} : {:success => false}
             end
-          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
             render :json => {:success => false, :message => ex.message}
           end
         end
@@ -82,10 +95,13 @@ module Knitkit
             current_user.with_capability('add_existing', 'Content') do
               website_section = WebsiteSection.find(params[:section_id])
               website_section.contents << Article.find(params[:article_id])
+              website_section.save
 
-              render :json => {:success => true}
+              website_section_content = website_section.website_section_contents.where('content_id = ?', params[:article_id]).first
+
+              render :json => {:success => true, :article => build_article_hash(website_section_content, website_section.website, website_section.is_blog?)}
             end
-          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
             render :json => {:success => false, :message => ex.message}
           end
         end
@@ -94,6 +110,11 @@ module Knitkit
           render :inline => Article.all.to_json(:only => [:internal_identifier, :id])
         end
 
+        def show
+          article = Article.find(params[:section_id])
+          render :json => article.to_json
+        end
+
         def get
           website_section_id = params[:section_id]
           section = WebsiteSection.find(website_section_id)
@@ -108,7 +129,7 @@ module Knitkit
 
           sort_hash = params[:sort].blank? ? {} : Hash.symbolize_keys(JSON.parse(params[:sort]).first)
           sort = sort_hash[:property] || sort_default
-          dir  = sort_hash[:direction] || dir_default
+          dir = sort_hash[:direction] || dir_default
           limit = params[:limit] || 10
           start = params[:start] || 0
 
@@ -118,6 +139,7 @@ module Knitkit
 
           Article.class_exec(website_section_id) do
             @@website_section_id = website_section_id
+
             def website_section_position
               self.website_section_contents.find_by_website_section_id(@@website_section_id).position
             end
@@ -130,8 +152,6 @@ module Knitkit
             articles_hash[:id] = a.id
             articles_hash[:title] = a.title
             articles_hash[:tag_list] = a.tag_list.join(', ')
-            articles_hash[:body_html] = a.body_html
-            articles_hash[:excerpt_html] = a.excerpt_html
             articles_hash[:internal_identifier] = a.internal_identifier
             articles_hash[:display_title] = a.display_title
             articles_hash[:position] = a.position(website_section_id)
@@ -147,12 +167,12 @@ module Knitkit
           Article.include_root_in_json = false
           sort_hash = params[:sort].blank? ? {} : Hash.symbolize_keys(JSON.parse(params[:sort]).first)
           sort = sort_hash[:property] || 'title'
-          dir  = sort_hash[:direction] || 'ASC'
+          dir = sort_hash[:direction] || 'ASC'
           limit = params[:limit] || 20
           start = params[:start] || 0
 
-          articles = Article.includes(:website_section_contents)      
-          articles = articles.where( :website_section_contents => { :content_id => nil } ) if params[:show_orphaned] == 'true'
+          articles = Article.includes(:website_section_contents)
+          articles = articles.where(:website_section_contents => {:content_id => nil}) if params[:show_orphaned] == 'true'
           articles = articles.where("UPPER(contents.internal_identifier) LIKE UPPER('%#{params[:iid]}%')") unless params[:iid].blank?
           articles = articles.where("UPPER(contents.title) LIKE UPPER('%#{params[:title]}%')") unless params[:title].blank?
           articles = articles.where("UPPER(contents.body_html) LIKE UPPER('%#{params[:content]}%')
@@ -165,7 +185,7 @@ module Knitkit
           articles.each do |a|
             articles_hash = {}
             articles_hash[:id] = a.id
-            articles_hash[:sections] = a.website_sections.collect{|section| section.title}.join(',')
+            articles_hash[:sections] = a.website_sections.collect { |section| section.title }.join(',')
             articles_hash[:title] = a.title
             articles_hash[:tag_list] = a.tag_list.join(', ')
             articles_hash[:body_html] = a.body_html
@@ -187,7 +207,7 @@ module Knitkit
         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'
+          dir = sort_hash[:direction] || 'DESC'
           limit = params[:limit] || 40
           start = params[:start] || 0
 
@@ -197,15 +217,15 @@ module Knitkit
 
           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)}
+              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)}
+              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)}
+              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)}
+              attributes = attributes.sort { |x, y| y.send(sort) <=> x.send(sort) }
             end
           end
 
@@ -277,8 +297,8 @@ module Knitkit
           render :json => result
         end
 
-      end#ArticlesController
-    end#Desktop
-  end#ErpApp
-end#Knitkit
+      end #ArticlesController
+    end #Desktop
+  end #ErpApp
+end #Knitkit