knitkit 2.0.5 → 2.0.6

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

@@ -8,23 +8,21 @@ module Knitkit
           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.hosts.first.attributes['host']}",
+              :url => "http://#{@website_primary_host}",
               :name => website.name,
               :title => website.title,
               :subtitle => website.subtitle,
               :isWebsite => true,
-              :email => website.email,
               :siteName => website.name,
-              :emailInquiries =>  website.email_inquiries?,
-              :autoActivatePublication => website.auto_activate_publication?,
               :children => []
             }
 
@@ -44,7 +42,6 @@ module Knitkit
 
             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|
@@ -80,7 +77,7 @@ module Knitkit
           unless item.linked_to_item.nil?
             linked_to_item_id = item.linked_to_item_id
             link_to_type = item.linked_to_item.class.to_s.underscore
-            url = "http://#{website.hosts.first.attributes['host']}" + item.linked_to_item.path
+            url = "http://#{@website_primary_host}" + item.linked_to_item.path
           end
 
           menu_item_hash = {
@@ -116,7 +113,7 @@ module Knitkit
             :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}",
+            :url => "http://#{@website_primary_host}#{website_section.path}",
             :internal_identifier => website_section.internal_identifier
           }
           if (website_section.is_a?(OnlineDocumentSection) || website_section.type == 'OnlineDocumentSection')

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

@@ -61,14 +61,14 @@ module Knitkit
               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 delete
           model = DesktopApplication.find_by_internal_identifier('knitkit')
           begin
@@ -103,12 +103,12 @@ module Knitkit
           section = WebsiteSection.find(website_section_id)
 
           if section.type == 'Blog'
-            sort_default = 'created_at'
+            sort_default = 'contents.created_at'
             dir_default = 'DESC'
           else
             sort_default = 'title'
             dir_default = 'ASC'
-          end            
+          end
 
           sort_hash = params[:sort].blank? ? {} : Hash.symbolize_keys(JSON.parse(params[:sort]).first)
           sort = sort_hash[:property] || sort_default
@@ -146,7 +146,7 @@ module Knitkit
 
           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)
@@ -157,7 +157,10 @@ module Knitkit
 
           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.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]}%')
+                                  OR UPPER(contents.excerpt_html) LIKE UPPER('%#{params[:content]}%')") unless params[:content].blank?
           articles = articles.order("contents.#{sort} #{dir}")
           total_count = articles.count
           articles = articles.limit(limit).offset(start)
@@ -195,7 +198,7 @@ module Knitkit
           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)}
@@ -277,7 +280,7 @@ module Knitkit
 
           render :json => result
         end
-	  
+
       end#ArticlesController
     end#Desktop
   end#ErpApp

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

@@ -4,6 +4,7 @@ module Knitkit
       
       class ContentController < Knitkit::ErpApp::Desktop::AppController
         def update
+          result = {:success => true}
           model = DesktopApplication.find_by_internal_identifier('knitkit')
           begin
             current_user.with_capability(model, 'edit_html', 'Article') do
@@ -11,8 +12,19 @@ module Knitkit
               html    = params[:html]
               content = Content.find(id)
               content.body_html = html
-    
-              render :json => (content.save ? {:success => true} : {:success => false})
+
+              if content.save
+                if params[:site_id]
+                  website = Website.find(params[:site_id])
+                  content.publish(website, 'Auto Publish', content.version, current_user) if website.publish_on_save?
+                end
+                #added for inline editing
+                result[:last_update] = content.updated_at.strftime("%m/%d/%Y %I:%M%p")
+              else
+                result = {:success => false}
+              end
+
+              render :json => result
             end
           rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
             render :json => {:success => false, :message => ex.message}
@@ -20,6 +32,7 @@ module Knitkit
         end
 
         def save_excerpt
+          result = {:success => true}
           model = DesktopApplication.find_by_internal_identifier('knitkit')
           begin
             current_user.with_capability(model, 'edit_excerpt', 'Article') do
@@ -27,8 +40,17 @@ module Knitkit
               html    = params[:html]
               content = Content.find(id)
               content.excerpt_html = html
-        
-              render :json => (content.save ? {:success => true} : {:success => false})
+
+              if content.save
+                if params[:site_id]
+                  website = Website.find(params[:site_id])
+                  content.publish(website, 'Auto Publish', content.version, current_user) if website.publish_on_save?
+                end
+              else
+                result = {:success => false}
+              end
+
+              render :json => result
             end
           rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
             render :json => {:success => false, :message => ex.message}

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

@@ -59,12 +59,12 @@ module Knitkit
           begin
             current_user.with_capability(model, capability_type, capability_resource) do
               result = {}
-              upload_path = request.env['HTTP_X_DIRECTORY'].blank? ? params[:directory] : request.env['HTTP_X_DIRECTORY']
-              name = request.env['HTTP_X_FILE_NAME'].blank? ? params[:file_data].original_filename : request.env['HTTP_X_FILE_NAME']
-              data = request.env['HTTP_X_FILE_NAME'].blank? ? params[:file_data] : request.raw_post
+              upload_path = params[:directory]
+              name = params[:name]
+              data = request.raw_post
 
               begin
-                upload_path == 'root_node' ? @assets_model.add_file(data, File.join(@file_support.root,base_path,name)) : @assets_model.add_file(data, File.join(@file_support.root,upload_path,name))
+                upload_path == 'root_node' ? @assets_model.add_file(data, File.join(base_path,name)) : @assets_model.add_file(data, File.join(@file_support.root,upload_path,name))
                 result = {:success => true}
               rescue Exception=>ex
                 logger.error ex.message
@@ -81,24 +81,32 @@ module Knitkit
         end
 
         def save_move
-          result          = {}
-          path            = params[:node]
+          messages = []
+          result = {}
+          path = params[:node]
           new_parent_path = params[:parent_node]
           new_parent_path = @root_node if new_parent_path == ROOT_NODE
-
-          if Rails.application.config.erp_tech_svcs.file_storage == :filesystem and !File.exists?(File.join(@file_support.root, path))
-            result = {:success => false, :msg => 'File does not exist.'}
-          else
-            #path = path[1..path.length] if path[0] == "/"
-            file = @assets_model.files.find(:first, :conditions => ['name = ? and directory = ?', ::File.basename(path), ::File.dirname(path)])
-            file.move(new_parent_path)
-            result = {:success => true, :msg => "#{File.basename(path)} was moved to #{new_parent_path} successfully"}
+          
+          nodes_to_move = (params[:selected_nodes] ? JSON(params[:selected_nodes]) : [params[:node]])
+          begin
+            nodes_to_move.each do |path|
+              if ErpTechSvcs::Config.file_storage == :filesystem and !File.exists?(File.join(@file_support.root, path))
+                result = {:success => false, :msg => 'File does not exist.'}
+              else
+                file = @assets_model.files.find(:first, :conditions => ['name = ? and directory = ?', ::File.basename(path), ::File.dirname(path)])
+                result, message = file.move(new_parent_path)
+              end
+              messages << message
+            end
+            render :json => {:success => true, :msg => messages.join(',')}
+          rescue Exception => e
+           render :json => {:success => false, :msg => e.message}
           end
-
-          render :json => result
         end
 
         def delete_file
+          messages = []
+
           if @context == Website
             capability_type = "view"
             capability_resource = "SiteFileAsset"
@@ -107,26 +115,33 @@ module Knitkit
             capability_resource = "GlobalFileAsset"
           end
 
+          nodes_to_delete = (params[:selected_nodes] ? JSON(params[:selected_nodes]) : [params[:node]])
+
           model = DesktopApplication.find_by_internal_identifier('knitkit')
           begin
-            current_user.with_capability(model, capability_type, capability_resource) do
-              path = params[:node]
-              path = "#{path}/" if params[:leaf] == 'false' and path.match(/\/$/).nil?
-              result = {}
-              begin
-                name = File.basename(path)
-                result, message, is_folder = @file_support.delete_file(File.join(@file_support.root,path))
-                if result && !is_folder
-                  file = @assets_model.files.find(:first, :conditions => ['name = ? and directory = ?', ::File.basename(path), ::File.dirname(path)])
-                  file.destroy
+            result = false
+            nodes_to_delete.each do |path|
+              current_user.with_capability(model, capability_type, capability_resource) do
+                path = "#{path}/" if params[:leaf] == 'false' and path.match(/\/$/).nil?                
+                begin
+                  name = File.basename(path)
+                  result, message, is_folder = @file_support.delete_file(File.join(@file_support.root,path))
+                  if result and !is_folder
+                    file = @assets_model.files.find(:first, :conditions => ['name = ? and directory = ?', ::File.basename(path), ::File.dirname(path)])
+                    file.destroy
+                  end
+                  messages << message
+                rescue Exception=>ex
+                  Rails.logger.error ex.message
+                  Rails.logger.error ex.backtrace.join("\n")
+                  render :json => {:success => false, :error => "Error deleting #{name}"} and return
                 end
-                result = {:success => result, :error => message}
-              rescue Exception=>ex
-                logger.error ex.message
-                logger.error ex.backtrace.join("\n")
-                result = {:success => false, :error => "Error deleting #{name}"}
-              end
-              render :json => result
+              end # end current_user.with_capability
+            end # end nodes_to_delete.each
+            if result
+              render :json => {:success => true, :message => messages.join(',')}
+            else
+              render :json => {:success => false, :error => messages.join(',')}
             end
           rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
             render :json => {:success => false, :message => ex.message}
@@ -209,8 +224,7 @@ module Knitkit
           @context = params[:context].to_sym
 
           if @context == :website
-            #get website id this can be an xhr request or regular
-            website_id = request.env['HTTP_X_WEBSITEID'].blank? ? params[:website_id] : request.env['HTTP_X_WEBSITEID']
+            website_id = params[:website_id]
             (@assets_model = website_id.blank? ? nil : Website.find(website_id))
 
             render :inline => {:success => false, :error => "No Website Selected"}.to_json if (@assets_model.nil? && params[:action] != "base_path")

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

@@ -23,12 +23,12 @@ module Knitkit
           begin
             current_user.with_capability(model, capability_type, capability_resource) do
               result = {}
-              upload_path = request.env['HTTP_X_DIRECTORY'].blank? ? params[:directory] : request.env['HTTP_X_DIRECTORY']
-              name = request.env['HTTP_X_FILE_NAME'].blank? ? params[:file_data].original_filename : request.env['HTTP_X_FILE_NAME']
-              data = request.env['HTTP_X_FILE_NAME'].blank? ? params[:file_data] : request.raw_post
+              upload_path = params[:directory]
+              name = params[:name]
+              data = request.raw_post
 
               begin
-                upload_path == 'root_node' ? @assets_model.add_file(data, File.join(@file_support.root,base_path,name)) : @assets_model.add_file(data, File.join(@file_support.root,upload_path,name))
+                upload_path == 'root_node' ? @assets_model.add_file(data, File.join(base_path,name)) : @assets_model.add_file(data, File.join(@file_support.root,upload_path,name))
                 result = {:success => true}
               rescue Exception=>ex
                 logger.error ex.message
@@ -45,6 +45,8 @@ module Knitkit
         end
 
         def delete_file
+          messages = []
+
           if @context == Website
             capability_type = "view"
             capability_resource = "SiteImageAsset"
@@ -53,26 +55,33 @@ module Knitkit
             capability_resource = "GlobalImageAsset"
           end
 
+          nodes_to_delete = (params[:selected_nodes] ? JSON(params[:selected_nodes]) : [params[:node]])
+
           model = DesktopApplication.find_by_internal_identifier('knitkit')
           begin
-            current_user.with_capability(model, capability_type, capability_resource) do
-              path = params[:node]
-              path = "#{path}/" if params[:leaf] == 'false' and path.match(/\/$/).nil?
-              result = {}
-              begin
-                name = File.basename(path)
-                result, message, is_folder = @file_support.delete_file(File.join(@file_support.root,path))
-                if result && !is_folder
-                  file = @assets_model.files.find(:first, :conditions => ['name = ? and directory = ?', ::File.basename(path), ::File.dirname(path)])
-                  file.destroy
+            result = false
+            nodes_to_delete.each do |path|
+              current_user.with_capability(model, capability_type, capability_resource) do
+                path = "#{path}/" if params[:leaf] == 'false' and path.match(/\/$/).nil?
+                begin
+                  name = File.basename(path)
+                  result, message, is_folder = @file_support.delete_file(File.join(@file_support.root,path))
+                  if result and !is_folder
+                    file = @assets_model.files.find(:first, :conditions => ['name = ? and directory = ?', ::File.basename(path), ::File.dirname(path)])
+                    file.destroy
+                  end
+                  messages << message
+                rescue Exception=>ex
+                  Rails.logger.error ex.message
+                  Rails.logger.error ex.backtrace.join("\n")
+                  render :json => {:success => false, :error => "Error deleting #{name}"} and return
                 end
-                result = {:success => result, :error => message}
-              rescue Exception=>ex
-                logger.error ex.message
-                logger.error ex.backtrace.join("\n")
-                result = {:success => false, :error => "Error deleting #{name}"}
-              end
-              render :json => result
+              end # end current_user.with_capability
+            end # end nodes_to_delete.each
+            if result
+              render :json => {:success => true, :message => messages.join(',')}
+            else
+              render :json => {:success => false, :error => messages.join(',')}
             end
           rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
             render :json => {:success => false, :message => ex.message}

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

@@ -155,23 +155,25 @@ module Knitkit
         end
 
         def save_move
+          result        = {}
+          nodes_to_move = (params[:selected_nodes] ? JSON(params[:selected_nodes]) : [params[:node]])
           model = DesktopApplication.find_by_internal_identifier('knitkit')
           begin
-            current_user.with_capability(model, 'view', 'Theme') do
-              result          = {}
-              path            = File.join(@file_support.root, params[:node])
-              new_parent_path = File.join(@file_support.root, params[:parent_node])
-
-              unless @file_support.exists? path
-                result = {:success => false, :msg => 'File does not exist.'}
-              else
-                theme_file = get_theme_file(path)
-                theme_file.move(params[:parent_node])
-                result = {:success => true, :msg => "#{File.basename(path)} was moved to #{new_parent_path} successfully"}
+            nodes_to_move.each do |node|
+              current_user.with_capability(model, 'view', 'Theme') do
+                path            = File.join(@file_support.root, node)
+                new_parent_path = File.join(@file_support.root, params[:parent_node])
+
+                unless @file_support.exists? path
+                  result = {:success => false, :msg => 'File does not exist.'}
+                else
+                  theme_file = get_theme_file(path)
+                  theme_file.move(params[:parent_node])
+                  result = {:success => true, :msg => "#{File.basename(path)} was moved to #{new_parent_path} successfully"}
+                end
               end
-
-              render :json => result
             end
+            render :json => result
           rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
             render :json => {:success => false, :message => ex.message}
           end
@@ -207,9 +209,9 @@ module Knitkit
           begin
             current_user.with_capability(model, 'view', 'Theme') do
               result = {}
-              upload_path = request.env['HTTP_EXTRAPOSTDATA_DIRECTORY'].blank? ? params[:directory] : request.env['HTTP_EXTRAPOSTDATA_DIRECTORY']
-              name = request.env['HTTP_X_FILE_NAME'].blank? ? params[:file_data].original_filename : request.env['HTTP_X_FILE_NAME']
-              data = request.env['HTTP_X_FILE_NAME'].blank? ? params[:file_data] : request.raw_post
+              upload_path = params[:directory]
+              name = params[:name]
+              data = request.raw_post
 
               theme = get_theme(upload_path)
               name = File.join(@file_support.root, upload_path, name)
@@ -231,25 +233,32 @@ module Knitkit
         end
 
         def delete_file
+          messages = []
+          nodes_to_delete = (params[:selected_nodes] ? JSON(params[:selected_nodes]) : [params[:node]])
           model = DesktopApplication.find_by_internal_identifier('knitkit')
           begin
-            current_user.with_capability(model, 'view', 'Theme') do
-              path = params[:node]
-              result = {}
-              begin
-                name = File.basename(path)
-                result, message, is_folder = @file_support.delete_file(File.join(@file_support.root,path))
-                if result && !is_folder
-                  theme_file = get_theme_file(path)
-                  theme_file.destroy
+            result = false
+            nodes_to_delete.each do |path|
+              current_user.with_capability(model, 'view', 'Theme') do                
+                begin
+                  name = File.basename(path)
+                  result, message, is_folder = @file_support.delete_file(File.join(@file_support.root,path))
+                  if result && !is_folder
+                    theme_file = get_theme_file(path)
+                    theme_file.destroy
+                  end
+                  messages << message
+                rescue Exception=>ex
+                  Rails.logger.error ex.message
+                  Rails.logger.error ex.backtrace.join("\n")
+                  render :json => {:success => false, :error => "Error deleting #{name}"} and return
                 end
-                result = {:success => result, :error => message}
-              rescue Exception=>ex
-                logger.error ex.message
-                logger.error ex.backtrace.join("\n")
-                result = {:success => false, :error => "Error deleting #{name}"}
-              end
-              render :json => result
+              end # end current_user.with_capability
+            end # end nodes_to_delete.each
+            if result
+              render :json => {:success => true, :message => messages.join(',')}
+            else
+              render :json => {:success => false, :error => messages.join(',')}
             end
           rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
             render :json => {:success => false, :message => ex.message}