knitkit 3.0.0 → 3.2.0

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

@@ -37,12 +37,10 @@ module Knitkit
               end
 
               begin
-                file_asset = if upload_path == 'root_node'
-                               @assets_model.add_file(data, File.join(base_path, name))
-                             else
-                               @assets_model.add_file(data, File.join(@file_support.root, upload_path, name))
-                             end
-                result = {:success => true, :url => file_asset.data.url}
+                path = (upload_path == 'root_node') ? File.join(base_path, name) : File.join(@file_support.root, upload_path, name)
+                @assets_model.add_file(data, path)
+
+                result = {:success => true, :node => @file_support.find_node(path, :file_asset_holder => @assets_model)}
               rescue => ex
                 logger.error ex.message
                 logger.error ex.backtrace.join("\n")
@@ -83,9 +81,12 @@ module Knitkit
                     file.destroy
                   end
                   messages << message
-                rescue Exception => ex
+                rescue StandardError => ex
                   Rails.logger.error ex.message
                   Rails.logger.error ex.backtrace.join("\n")
+
+                  ExceptionNotifier.notify_exception(ex) if defined? ExceptionNotifier
+
                   render :json => {:success => false, :error => "Error deleting #{name}"} and return
                 end
               end # end current_user.with_capability
@@ -106,9 +107,15 @@ module Knitkit
           @root_node = nil
 
           if @context == :website
-            @root_node = File.join(Rails.application.config.knitkit.images_base_path, "sites", @assets_model.iid, "images") unless @assets_model.nil?
+            @root_node = File.join('public',
+                                   'sites',
+                                   @assets_model.iid,
+                                   'images') unless @assets_model.nil?
           else
-            @root_node = File.join(Rails.application.config.knitkit.images_base_path, 'images')
+            @root_node = File.join('public',
+                                   "dba_organizations",
+                                   current_user.party.dba_organization.id.to_s,
+                                   'images')
           end
 
           @root_node

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

@@ -2,25 +2,25 @@ module Knitkit
   module ErpApp
     module Desktop
       class OnlineDocumentSectionsController < Knitkit::ErpApp::Desktop::AppController
-        
-        def new
+
+        def create
           @website = Website.find(params[:website_id])
           online_document_section = OnlineDocumentSection.new(:website_id => @website.id,
                                                               :in_menu => params[:in_menu] == 'yes', :title => params[:title],
                                                               :internal_identifier => params[:internal_identifier])
-           
+
           if online_document_section.save
             if params[:website_section_id]
               parent_website_section = WebsiteSection.find(params[:website_section_id])
               online_document_section.move_to_child_of(parent_website_section)
-            end 
-            online_document_section.update_path!
-            if params[:documenttype] == "Content"
-              documented_content = DocumentedContent.create(:title => online_document_section.title, :created_by => current_user, :body_html => online_document_section.title)
-              DocumentedItem.create(:documented_content_id => documented_content.id, :online_document_section_id => online_document_section.id)
             end
-            
-            result = {:success => true, :node => build_section_hash(online_document_section),
+            online_document_section.update_path!
+
+            documented_content = DocumentedContent.create(:title => online_document_section.title, :created_by => current_user, :body_html => online_document_section.title)
+            DocumentedItem.create(:documented_content_id => documented_content.id, :online_document_section_id => online_document_section.id)
+
+            result = {:success => true,
+                      :node => build_section_hash(online_document_section),
                       :documented_content => documented_content.content_hash}
           else
             message = "<ul>"
@@ -32,8 +32,62 @@ module Knitkit
           end
 
           render :json => result
-        end     
-      end
-    end
-  end
-end
+        end
+
+        def existing_documents
+          website = Website.find(params[:website_id])
+          OnlineDocumentSection.class_eval do
+            def title_permalink
+              "#{self.title} - #{self.path}"
+            end
+          end
+          render :inline => website.online_document_sections.to_json(:only => [:id], :methods => [:title_permalink])
+        end
+
+        def content
+          document_section = OnlineDocumentSection.find(params[:id])
+
+          render :json => {success: true, content: document_section.documented_item_content_html}
+        end
+
+        def copy
+          begin
+
+            @website = Website.find(params[:website_id])
+            parent_section = WebsiteSection.where('id = ?', params[:parent_section_id]).first
+            section_to_copy = OnlineDocumentSection.find(params[:id])
+
+            new_section = section_to_copy.copy(params[:title].strip, true, current_user)
+
+            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 Document'}
+          end
+
+          render :json => result
+        end
+
+      end # OnlineDocumentSectionsController
+    end # Desktop
+  end # ErpApp
+end # Knitkit

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

@@ -3,85 +3,72 @@ module Knitkit
     module Desktop
       class PositionController < Knitkit::ErpApp::Desktop::AppController
 
-        def change_section_parent
-          begin
-            current_user.with_capability('drag_item', 'WebsiteTree') do
+        around_filter :wrap_in_transaction
 
-              new_parent = WebsiteSection.where('id = ?', params[:parent_id]).first
-              website_section = WebsiteSection.find(params[:section_id])
+        def update_section_position
+          params[:position_array].each do |position|
+            website_section = WebsiteSection.find(position['id'])
 
-              if new_parent
-                website_section.move_to_child_of(new_parent)
-              else
-                website_section.move_to_root
-              end
+            if position['parent_id'].blank? || position['parent_id'] == 'root'
+              website_section.move_to_root
+            else
+              website_section.move_to_child_of(WebsiteSection.find(position['parent_id']))
+            end
 
-              render :json => {:success => true}
+            website_section.position = position['position'].to_i
 
-            end
-          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
-            render :json => {:success => false, :message => ex.message}
+            website_section.save
           end
+
+          render :json => {:success => true}
         end
 
-        def update_section_position
-          begin
-            current_user.with_capability('drag_item', 'WebsiteTree') do
+        def update_menu_item_position
+          params[:position_array].each do |position|
+            website_nav_item = WebsiteNavItem.find(position['id'])
+            website_nav_item.position = position['position'].to_i
+            website_nav_item.save
+          end
 
-              params[:position_array].each do |position|
-                model = WebsiteSection.find(position['id'])
-                model.position = position['position'].to_i
-                model.save
-              end
+          render :json => {:success => true}
+        end
 
-              render :json => {:success => true}
+        def update_article_position
+          website_section = WebsiteSection.find(params[:section_id])
 
-            end
-          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
-            render :json => {:success => false, :message => ex.message}
+          params[:position_array].each do |position|
+            article = website_section.website_section_contents.where('content_id = ?', position['id']).first
+            article.position = position['position'].to_i
+            article.save
           end
+
+          render :json => {:success => true}
         end
 
-        def update_menu_item_position
-          begin
-            current_user.with_capability('drag_item', 'WebsiteTree') do
+        private
 
-              params[:position_array].each do |position|
-                model = WebsiteNavItem.find(position['id'])
-                model.position = position['position'].to_i
-                model.save
+        def wrap_in_transaction
+          begin
+            ActiveRecord::Base.transaction do
+              current_user.with_capability('drag_item', 'WebsiteTree') do
+                yield
               end
-
-              render :json => {:success => true}
-
             end
           rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
             render :json => {:success => false, :message => ex.message}
-          end
-        end
 
-        def update_article_position
-          begin
-            current_user.with_capability('drag_item', 'WebsiteTree') do
-
-              website_section = WebsiteSection.find(params[:section_id])
-
-              params[:position_array].each do |position|
-                model = website_section.website_section_contents.where('content_id = ?', position['id']).first
-                model.position = position['position'].to_i
-                model.save
-              end
+          rescue => ex
+            Rails.logger.error ex.message + "\n"
+            Rails.logger.error ex.backtrace.join("\n")
 
-              render :json => {:success => true}
+            # email notification
+            ExceptionNotifier.notify_exception(ex) if defined? ExceptionNotifier
 
-            end
-          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
-            render :json => {:success => false, :message => ex.message}
+            render :json => {success: false, message: 'Could not process request'}
           end
         end
 
-      end #PositionController
-    end #Desktop
-  end #ErpApp
-end #Knitkit
-
+      end # PositionController
+    end # Desktop
+  end # ErpApp
+end # Knitkit

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

@@ -39,7 +39,7 @@ module Knitkit
           begin
             current_user.with_capability('view', 'Theme') do
               unless params[:theme_data].blank?
-                Theme.import(params[:theme_data], @website)
+                theme = Theme.import(params[:theme_data], @website)
               else
                 theme = Theme.create(:website => @website, :name => params[:name], :theme_id => params[:theme_id])
                 theme.version = params[:version]
@@ -49,8 +49,29 @@ module Knitkit
                 theme.save
                 theme.create_theme_files!
               end
+              render :inline => {:success => true, :node => build_tree_node(theme, @website)}.to_json
+            end
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
+            render :json => {:success => false, :message => ex.message}
+          end
+        end
 
-              render :inline => {:success => true}.to_json
+        def update
+          begin
+            current_user.with_capability('view', 'Theme') do
+              theme = Theme.find(params[:id])
+              theme.name = params[:name].strip
+              if theme.save
+                render :json => {
+                         success: true,
+                         theme: {
+                           name: theme.name,
+                           text: "#{theme.name}[#{theme.theme_id}]"
+                         }
+                       }
+              else
+                render :json => {success: false}
+              end
             end
           rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
             render :json => {:success => false, :message => ex.message}
@@ -106,7 +127,7 @@ module Knitkit
               theme = get_theme(path)
               theme.add_file('#Empty File', File.join(path, name))
 
-              render :json => {:success => true}
+              render :json => {:success => true, :node => @file_support.find_node(File.join(path, name), {:file_asset_holder => theme})}
             end
           rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
             render :json => {:success => false, :message => ex.message}
@@ -120,7 +141,7 @@ module Knitkit
               name = params[:name]
 
               @file_support.create_folder(path, name)
-              render :json => {:success => true}
+              render :json => {:success => true, :node => @file_support.find_node(File.join(path, name), {keep_full_path: false})}
             end
           rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
             render :json => {:success => false, :message => ex.message}
@@ -209,7 +230,7 @@ module Knitkit
 
               begin
                 theme.add_file(data, name)
-                result = {:success => true}
+                result = {:success => true, :node => @file_support.find_node(name, {:file_asset_holder => theme})}
               rescue => ex
                 logger.error ex.message
                 logger.error ex.backtrace.join("\n")
@@ -232,15 +253,18 @@ module Knitkit
               current_user.with_capability('view', 'Theme') do
                 begin
                   name = File.basename(path)
-                  result, message, is_folder = @file_support.delete_file(File.join(@file_support.root, path))
+                  result, message, is_folder = @file_support.delete_file(File.join(@file_support.root, path), {force: true})
                   if result && !is_folder
                     theme_file = get_theme_file(path)
                     theme_file.destroy
                   end
                   messages << message
-                rescue Exception => ex
+                rescue StandardError => ex
                   Rails.logger.error ex.message
                   Rails.logger.error ex.backtrace.join("\n")
+
+                  ExceptionNotifier.notify_exception(ex) if defined? ExceptionNotifier
+
                   render :json => {:success => false, :error => "Error deleting #{name}"} and return
                 end
               end # end current_user.with_capability
@@ -262,7 +286,7 @@ module Knitkit
               path = params[:node]
               name = params[:file_name]
 
-              result, message = @file_support.rename_file(@file_support.root+path, name)
+              result, message = @file_support.rename_file(File.join(@file_support.root, path), name)
               if result
                 theme_file = get_theme_file(path)
                 theme_file.name = name
@@ -311,33 +335,44 @@ module Knitkit
           theme.files.where('name = ? and directory = ?', ::File.basename(path), file_dir).first
         end
 
+        def build_tree_node(theme, website)
+
+          theme_hash = {
+            :name => theme.name,
+            :text => "#{theme.name}[#{theme.theme_id}]",
+            :handleContextMenu => true,
+            :siteId => website.id,
+            :isActive => (theme.active == 1), :iconCls => 'icon-content',
+            :isTheme => true,
+            :id => theme.id,
+            :children => []
+          }
+          if theme.active == 1
+            theme_hash[:iconCls] = 'icon-add'
+          else
+            theme_hash[:iconCls] = 'icon-delete'
+          end
+
+          ['stylesheets', 'javascripts', 'images', 'templates', 'widgets', 'fonts'].each do |resource_folder|
+            theme_hash[:children] << {
+              :themeId => theme.id,
+              :siteId => website.id,
+              :text => resource_folder.capitalize,
+              :iconCls => 'icon-content',
+              :handleContextMenu => (resource_folder == 'widgets'),
+              :id => "#{theme.url}/#{resource_folder}"
+            }
+          end
+          theme_hash
+        end
+
         def setup_tree
           tree = []
 
           if @website
             #handle themes
             @website.themes.each do |theme|
-              theme_hash = {:text => "#{theme.name}[#{theme.theme_id}]", :handleContextMenu => true,
-                            :siteId => @website.id, :isActive => (theme.active == 1), :iconCls => 'icon-content',
-                            :isTheme => true, :id => theme.id, :children => []}
-
-              if theme.active == 1
-                theme_hash[:iconCls] = 'icon-add'
-              else
-                theme_hash[:iconCls] = 'icon-delete'
-              end
-
-              ['stylesheets', 'javascripts', 'images', 'templates', 'widgets'].each do |resource_folder|
-                theme_hash[:children] << {
-                    :themeId => theme.id,
-                    :siteId => @website.id,
-                    :text => resource_folder.capitalize,
-                    :iconCls => 'icon-content',
-                    :handleContextMenu => (resource_folder == 'widgets'),
-                    :id => "#{theme.url}/#{resource_folder}"
-                }
-              end
-
+              theme_hash = build_tree_node(theme, @website)
               tree << theme_hash
             end
           end

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

@@ -8,9 +8,13 @@ module Knitkit
                                               :build_host_hash, :activate_publication, :publish, :update, :delete]
 
         def index
-          render :json => {:sites => Website.all.collect { |item| item.to_hash(:only => [:id, :name, :title, :subtitle],
-                                                                               :configuration_id => item.configurations.first.id,
-                                                                               :url => "http://#{item.config_value('primary_host')}") }}
+          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'))
+
+          render :json => {:sites => websites.all.collect { |item| item.to_hash(:only => [:id, :name, :title, :subtitle],
+                                                                                :configuration_id => item.configurations.first.id,
+                                                                                :url => "#{request.protocol}#{item.config_value('primary_host')}") }}
         end
 
         def build_content_tree
@@ -71,8 +75,8 @@ module Knitkit
           render :inline => "{\"success\":true, \"results\":#{published_websites.count},
                             \"totalCount\":#{@website.published_websites.count},
                             \"data\":#{published_websites.to_json(
-              :only => [:comment, :id, :version, :created_at, :active],
-              :methods => [:viewing, :published_by_username])} }"
+                     :only => [:comment, :id, :version, :created_at, :active],
+                     :methods => [:viewing, :published_by_username])} }"
         end
 
         def activate_publication
@@ -134,6 +138,12 @@ module Knitkit
                 first_publication.published_by = current_user
                 first_publication.save
 
+                website_host = WebsiteHost.find_by_host(params[:host])
+                if website_host
+                  website_name = website_host.website.name
+                  raise "Host #{website_host.host} already used by #{website_name}"
+                end
+
                 website.hosts << WebsiteHost.create(:host => params[:host])
                 website.configurations.first.update_configuration_item(ConfigurationItemType.find_by_internal_identifier('primary_host'), params[:host])
                 website.save
@@ -142,6 +152,11 @@ module Knitkit
 
                 PublishedWebsite.activate(website, 1, current_user)
 
+                # set the currents users dba_org as the dba_org for this website
+                WebsitePartyRole.create(website: website,
+                                        party: current_user.party.dba_organization,
+                                        role_type: RoleType.iid('dba_org'))
+
                 render :json => {:success => true, :website => website.to_hash(:only => [:id, :name],
                                                                                :configuration_id => website.configurations.first.id,
                                                                                :url => "http://#{website.config_value('primary_host')}")}
@@ -151,7 +166,6 @@ module Knitkit
             Rails.logger.error("#{ex.message} + #{ex.backtrace.join("\n")}")
             render :json => {:success => false, :message => ex.message}
           end
-
         end
 
         def update
@@ -182,7 +196,7 @@ module Knitkit
           zip_path = @website.export
           begin
             send_file(zip_path.to_s, :stream => false)
-          rescue Exception => ex
+          rescue StandardError => ex
             raise "Error sending #{zip_path} file"
           end
         end
@@ -192,7 +206,7 @@ module Knitkit
           if zip_path
             begin
               send_file(zip_path, :stream => false)
-            rescue Exception => ex
+            rescue StandardError => ex
               raise "Error sending file. Make sure you have a website and an active theme."
             end
           else
@@ -209,17 +223,20 @@ module Knitkit
           else
             render :inline => {:success => false, :message => message}.to_json
           end
+          WebsitePartyRole.create(website: website,
+                                  party: current_user.party.dba_organization,
+                                  role_type: RoleType.iid('dba_org'))
         ensure
           FileUtils.rm_r File.dirname(zip_path) rescue nil
         end
 
-        def importtemplate
-          website, message = Website.import_template_director(params[:website_data], User.first)
+        def import_template
+          result = Website.import_template(params[:website_data], current_user)
 
-          if website
-            render :inline => {:success => true, :website => website.to_hash(:only => [:id, :name])}.to_json
+          if result[:success]
+            render :inline => {:success => true, :website => result[:website].to_hash(:only => [:id, :name])}.to_json
           else
-            render :inline => {:success => false, :message => message}.to_json
+            render :inline => {:success => false, :message => result[:message]}.to_json
           end
         end
 
@@ -230,6 +247,12 @@ module Knitkit
           # example found in knitkit module.js
         end
 
+        def get_current_host
+          current_host = request.host_with_port
+          existing_website_host = WebsiteHost.find_by_host(current_host)
+          render :json => {:success => !existing_website_host.present?, :host => current_host}
+        end
+
       end # WebsiteController
     end # Desktop
   end # ErpApp