knitkit 2.1.15 → 3.0.0

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

@@ -12,15 +12,20 @@ module Knitkit
               content = Content.find(id)
               content.body_html = html
 
-              if content.save
-                unless params[:site_id].blank?
-                  website = Website.find(params[:site_id])
-                  content.publish(website, 'Auto Publish', content.version, current_user) if website.publish_on_save?
+              #TODO this should probably be moved into the view
+              if content.altered?
+                if content.save
+                  unless params[:site_id].blank?
+                    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
-                #added for inline editing
-                result[:last_update] = content.updated_at.strftime("%m/%d/%Y %I:%M%p")
               else
-                result = {:success => false}
+                result = {:success => true}
               end
 
               render :json => result
@@ -39,13 +44,18 @@ module Knitkit
               content = Content.find(id)
               content.excerpt_html = html
 
-              if content.save
-                unless params[:site_id].blank?
-                  website = Website.find(params[:site_id])
-                  content.publish(website, 'Auto Publish', content.version, current_user) if website.publish_on_save?
+              #TODO this should probably be moved into the view
+              if content.altered?
+                if content.save
+                  unless params[:site_id].blank?
+                    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
               else
-                result = {:success => false}
+                result = {:success => true}
               end
 
               render :json => result

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

@@ -66,7 +66,7 @@ module Knitkit
               begin
                 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
+              rescue => ex
                 logger.error ex.message
                 logger.error ex.backtrace.join("\n")
                 result = {:success => false, :error => "Error uploading file."}

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

@@ -2,11 +2,17 @@ module Knitkit
   module ErpApp
     module Desktop
       class ImageAssetsController < FileAssetsController
-        
+
         def get_images
           directory = (params[:directory] == 'root_node' or params[:directory].blank?) ? base_path : params[:directory]
           # this @assets_model.images.select should be refactored into a query
-          render :json => @assets_model.images.select{|image| image.directory == directory.sub(@file_support.root,'')}.collect{|image|{:name => image.name, :shortName => image.name[0..15], :url => image.data.url}}
+          render :json => @assets_model.images.select { |image| image.directory == directory.sub(@file_support.root, '') }.collect { |image| {:id => image.id,
+                                                                                                                                              :name => image.name,
+                                                                                                                                              :shortName => image.name[0..15],
+                                                                                                                                              :url => image.data.url,
+                                                                                                                                              :height => image.height,
+                                                                                                                                              :width => image.width,
+                                                                                                                                              :downloadPath => image.data.path} }
         end
 
         def upload_file
@@ -19,7 +25,6 @@ module Knitkit
             capability_resource = "GlobalImageAsset"
           end
 
-          model = DesktopApplication.find_by_internal_identifier('knitkit')
           begin
             current_user.with_capability(capability_type, capability_resource) do
               result = {}
@@ -27,10 +32,18 @@ module Knitkit
               name = params[:name]
               data = request.raw_post
 
+              if params[:is_drag_drop]
+                data = Base64.decode64(data.split(',').last)
+              end
+
               begin
-                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
+                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}
+              rescue => ex
                 logger.error ex.message
                 logger.error ex.backtrace.join("\n")
                 result = {:success => false, :error => "Error uploading file."}
@@ -39,7 +52,7 @@ module Knitkit
               #the awesome uploader widget whats this to mime type text, leave it render :inline
               render :inline => result.to_json
             end
-          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
             render :json => {:success => false, :message => ex.message}
           end
         end
@@ -57,7 +70,6 @@ module Knitkit
 
           nodes_to_delete = (params[:selected_nodes] ? JSON(params[:selected_nodes]) : [params[:node]])
 
-          model = DesktopApplication.find_by_internal_identifier('knitkit')
           begin
             result = false
             nodes_to_delete.each do |path|
@@ -65,13 +77,13 @@ module Knitkit
                 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))
+                  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
+                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
@@ -83,7 +95,7 @@ module Knitkit
             else
               render :json => {:success => false, :error => messages.join(',')}
             end
-          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
             render :json => {:success => false, :message => ex.message}
           end
         end
@@ -105,8 +117,8 @@ module Knitkit
         def set_file_support
           @file_support = ErpTechSvcs::FileSupport::Base.new(:storage => Rails.application.config.erp_tech_svcs.file_storage)
         end
-        
-      end#ImageAssetsController
-    end#Desktop
-  end#ErpApp
-end#Knitkit
+
+      end #ImageAssetsController
+    end #Desktop
+  end #ErpApp
+end #Knitkit

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

@@ -3,66 +3,32 @@ module Knitkit
     module Desktop
       class InquiriesController < Knitkit::ErpApp::Desktop::AppController
 
-        def setup
-          form = DynamicForm.get_form('WebsiteInquiry')
-          definition = form.definition_object
-    
-          columns = []
-          definition.each do |field_hash|
-            field_hash['width'] = 120
-            columns << DynamicGridColumn.build_column(field_hash)
-          end
-    
-          columns << DynamicGridColumn.build_column({ :fieldLabel => "Username", :name => 'username', :xtype => 'textfield' })
-          columns << DynamicGridColumn.build_column({ :fieldLabel => "Created At", :name => 'created_at', :xtype => 'datefield', :width => 75 })
-          columns << DynamicGridColumn.build_view_column("Ext.getCmp('knitkitCenterRegion').showComment(rec.get('message'));")
-          columns << DynamicGridColumn.build_delete_column("Ext.getCmp('InquiriesGridPanel').deleteInquiry(rec);")
-    
-          definition << DynamicFormField.textfield({ :fieldLabel => "Username", :name => 'username' })
-          definition << DynamicFormField.datefield({ :fieldLabel => "Created At", :name => 'created_at' })
-          definition << DynamicFormField.hidden({ :fieldLabel => "ID", :name => 'id' })
-    
-          result = "{
-                      \"success\": true,
-                      \"model\": \"WebsiteInquiry\",
-                      \"validations\": \"[]\",
-                      \"columns\": [#{columns.join(',')}],
-                      \"fields\": #{definition.to_json}
-                    }"
-    
-          render :inline => result
-        end
-
-        def get
-          WebsiteInquiry.include_root_in_json = false
+        def index
+          limit = params[:limit] || 15
+          offset = params[:start] || 0
 
           website = Website.find(params[:website_id])
           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'
 
-          website_inquiries = website.website_inquiries.paginate(:page => page, :per_page => per_page, :order => "#{sort} #{dir}")
+          total = website.website_inquiries.count
 
-          wi = []
-          website_inquiries.each do |i|
-            wihash = i.data.dynamic_attributes_without_prefix
+          inquiries = website.website_inquiries.limit(limit).offset(offset).order("#{sort} #{dir}")
 
-            wihash[:id] = i.id
-            wihash[:username] = i.data.created_by.nil? ? '' : i.data.created_by.username
-            wihash[:created_at] = i.data.created_at
-            wi << wihash
-          end
-    
-          render :inline => "{ total:#{website_inquiries.total_entries}, data:#{wi.to_json} }"
+          render :json => {:success => true, :total => total, :inquiries => inquiries.collect { |inquiry|
+            inquiry.to_hash(:only => [:id, :first_name, :last_name, :message, :email, :created_at],
+                            :username => (inquiry.created_by.nil? ? '' : inquiry.created_by.username)) }
+          }
         end
 
-        def delete
+        def destroy
           website_inquiry = WebsiteInquiry.find(params[:id])
           website_inquiry.destroy
           render :json => {:success => true}
         end
 
-      end#InquiriesController
-    end#Desktop
-  end#ErpApp
-end#Knitkit
+      end #InquiriesController
+    end #Desktop
+  end #ErpApp
+end #Knitkit

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

@@ -4,8 +4,9 @@ module Knitkit
       class OnlineDocumentSectionsController < Knitkit::ErpApp::Desktop::AppController
         
         def new
-          website = Website.find(params[:website_id])
-          online_document_section = OnlineDocumentSection.new(:website_id => website.id, :in_menu => params[:in_menu] == 'yes', :title => params[:title],
+          @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
@@ -19,7 +20,7 @@ module Knitkit
               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.website),
+            result = {:success => true, :node => build_section_hash(online_document_section),
                       :documented_content => documented_content.content_hash}
           else
             message = "<ul>"

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

@@ -2,28 +2,86 @@ module Knitkit
   module ErpApp
     module Desktop
       class PositionController < Knitkit::ErpApp::Desktop::AppController
-        
-        def update
-          model = DesktopApplication.find_by_internal_identifier('knitkit')
+
+        def change_section_parent
+          begin
+            current_user.with_capability('drag_item', 'WebsiteTree') do
+
+              new_parent = WebsiteSection.where('id = ?', params[:parent_id]).first
+              website_section = WebsiteSection.find(params[:section_id])
+
+              if new_parent
+                website_section.move_to_child_of(new_parent)
+              else
+                website_section.move_to_root
+              end
+
+              render :json => {:success => true}
+
+            end
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
+            render :json => {:success => false, :message => ex.message}
+          end
+        end
+
+        def update_section_position
           begin
             current_user.with_capability('drag_item', 'WebsiteTree') do
 
               params[:position_array].each do |position|
-                model = position['klass'].constantize.find(position['id'])
+                model = WebsiteSection.find(position['id'])
                 model.position = position['position'].to_i
                 model.save
               end
 
               render :json => {:success => true}
-              
+
             end
-          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
             render :json => {:success => false, :message => ex.message}
           end
         end
-        
-      end#PositionController
-    end#Desktop
-  end#ErpApp
-end#Knitkit
+
+        def update_menu_item_position
+          begin
+            current_user.with_capability('drag_item', 'WebsiteTree') do
+
+              params[:position_array].each do |position|
+                model = WebsiteNavItem.find(position['id'])
+                model.position = position['position'].to_i
+                model.save
+              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
+
+              render :json => {:success => true}
+
+            end
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
+            render :json => {:success => false, :message => ex.message}
+          end
+        end
+
+      end #PositionController
+    end #Desktop
+  end #ErpApp
+end #Knitkit
 

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

@@ -3,7 +3,7 @@ module Knitkit
     module Desktop
       class ThemeController < ::ErpApp::Desktop::FileManager::BaseController
         before_filter :set_file_support
-        before_filter :set_website, :only => [:new, :change_status, :available_themes]
+        before_filter :set_website, :only => [:index, :new, :change_status, :available_themes]
         before_filter :set_theme, :only => [:delete, :change_status, :theme_widget, :available_widgets]
         IGNORED_PARAMS = %w{action controller node_id theme_data}
 
@@ -21,11 +21,13 @@ module Knitkit
         end
 
         def available_themes
-          render :json => {:success => true, :themes => @website.themes.map{|theme|{:id => theme.id, :name => theme.name}}}
+          render :json => {:success => true,
+                           :themes => @website.themes.map { |theme| {:id => theme.id, :name => theme.name} }}
         end
 
         def available_widgets
-          render :json => {:success => true, :widgets => @theme.non_themed_widgets.map{|widget|{:id => widget, :name => widget.humanize}}}
+          render :json => {:success => true,
+                           :widgets => @theme.non_themed_widgets.map { |widget| {:id => widget, :name => widget.humanize} }}
         end
 
         def theme_widget
@@ -40,17 +42,17 @@ module Knitkit
                 Theme.import(params[:theme_data], @website)
               else
                 theme = Theme.create(:website => @website, :name => params[:name], :theme_id => params[:theme_id])
-                theme.version  = params[:version]
-                theme.author   = params[:author]
+                theme.version = params[:version]
+                theme.author = params[:author]
                 theme.homepage = params[:homepage]
-                theme.summary  = params[:summary]
+                theme.summary = params[:summary]
                 theme.save
                 theme.create_theme_files!
               end
 
               render :inline => {:success => true}.to_json
             end
-          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
             render :json => {:success => false, :message => ex.message}
           end
         end
@@ -61,10 +63,10 @@ module Knitkit
               if @theme.destroy
                 render :json => {:success => true}
               else
-                render :json =>  {:success => false}
+                render :json => {:success => false}
               end
             end
-          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
             render :json => {:success => false, :message => ex.message}
           end
         end
@@ -84,7 +86,7 @@ module Knitkit
 
               render :json => {:success => true}
             end
-          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
             render :json => {:success => false, :message => ex.message}
           end
         end
@@ -98,7 +100,7 @@ module Knitkit
         def create_file
           begin
             current_user.with_capability('view', 'Theme') do
-              path = File.join(@file_support.root,params[:path])
+              path = File.join(@file_support.root, params[:path])
               name = params[:name]
 
               theme = get_theme(path)
@@ -106,7 +108,7 @@ module Knitkit
 
               render :json => {:success => true}
             end
-          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
             render :json => {:success => false, :message => ex.message}
           end
         end
@@ -114,13 +116,13 @@ module Knitkit
         def create_folder
           begin
             current_user.with_capability('view', 'Theme') do
-              path = File.join(@file_support.root,params[:path])
+              path = File.join(@file_support.root, params[:path])
               name = params[:name]
 
               @file_support.create_folder(path, name)
               render :json => {:success => true}
             end
-          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
             render :json => {:success => false, :message => ex.message}
           end
         end
@@ -128,7 +130,7 @@ module Knitkit
         def update_file
           begin
             current_user.with_capability('view', 'Theme') do
-              path = File.join(@file_support.root,params[:node])
+              path = File.join(@file_support.root, params[:node])
               content = params[:content]
 
               type = File.extname(File.basename(path)).gsub(/^\.+/, '').to_sym
@@ -141,18 +143,18 @@ module Knitkit
                 render :json => {:success => false, :message => result}
               end
             end
-          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
             render :json => {:success => false, :message => ex.message}
           end
         end
 
         def save_move
-          result        = {}
+          result = {}
           nodes_to_move = (params[:selected_nodes] ? JSON(params[:selected_nodes]) : [params[:node]])
           begin
             nodes_to_move.each do |node|
               current_user.with_capability('view', 'Theme') do
-                path            = File.join(@file_support.root, node)
+                path = File.join(@file_support.root, node)
                 new_parent_path = File.join(@file_support.root, params[:parent_node])
 
                 unless @file_support.exists? path
@@ -165,7 +167,7 @@ module Knitkit
               end
             end
             render :json => result
-          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
             render :json => {:success => false, :message => ex.message}
           end
         end
@@ -173,18 +175,18 @@ module Knitkit
         def download_file
           begin
             current_user.with_capability('view', 'Theme') do
-              path = File.join(@file_support.root,params[:path])
+              path = File.join(@file_support.root, params[:path])
               contents, message = @file_support.get_contents(path)
 
               send_data contents, :filename => File.basename(path)
             end
-          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
             render :json => {:success => false, :message => ex.message}
           end
         end
 
         def get_contents
-          path = File.join(@file_support.root,params[:node])
+          path = File.join(@file_support.root, params[:node])
           contents, message = @file_support.get_contents(path)
 
           if contents.nil?
@@ -208,7 +210,7 @@ module Knitkit
               begin
                 theme.add_file(data, name)
                 result = {:success => true}
-              rescue Exception=>ex
+              rescue => ex
                 logger.error ex.message
                 logger.error ex.backtrace.join("\n")
                 result = {:success => false, :error => "Error uploading #{name}"}
@@ -216,7 +218,7 @@ module Knitkit
 
               render :inline => result.to_json
             end
-          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
             render :json => {:success => false, :message => ex.message}
           end
         end
@@ -227,16 +229,16 @@ module Knitkit
           begin
             result = false
             nodes_to_delete.each do |path|
-              current_user.with_capability('view', 'Theme') do                
+              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))
                   if result && !is_folder
                     theme_file = get_theme_file(path)
                     theme_file.destroy
                   end
                   messages << message
-                rescue Exception=>ex
+                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
@@ -248,7 +250,7 @@ module Knitkit
             else
               render :json => {:success => false, :error => messages.join(',')}
             end
-          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
             render :json => {:success => false, :message => ex.message}
           end
         end
@@ -267,9 +269,9 @@ module Knitkit
                 theme_file.save
               end
 
-              render :json =>  {:success => true, :message => message}
+              render :json => {:success => true, :message => message}
             end
-          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
             render :json => {:success => false, :message => ex.message}
           end
         end
@@ -291,9 +293,9 @@ module Knitkit
 
         def get_theme(path)
           sites_index = path.index('sites')
-          sites_path  = path[sites_index..path.length]
-          site_name   = sites_path.split('/')[1]
-          site        = Website.find_by_internal_identifier(site_name)
+          sites_path = path[sites_index..path.length]
+          site_name = sites_path.split('/')[1]
+          site = Website.find_by_internal_identifier(site_name)
 
           themes_index = path.index('themes')
           path = path[themes_index..path.length]
@@ -311,43 +313,38 @@ module Knitkit
 
         def setup_tree
           tree = []
-          sites = Website.all
-          sites.each do |site|
-            site_hash = {
-              :text => site.name,
-              :browseable => true,
-              :contextMenuDisabled => true,
-              :iconCls => 'icon-globe',
-              :id => "site_#{site.id}",
-              :leaf => false,
-              :children => []
-            }
 
+          if @website
             #handle themes
-            themes_hash = {:text => 'Themes', :contextMenuDisabled => true, :iconCls => 'icon-content', :isThemeRoot => true, :siteId => site.id, :children => []}
-            site.themes.each do |theme|
-              theme_hash = {:text => "#{theme.name}[#{theme.theme_id}]", :handleContextMenu => true, :siteId => site.id, :isActive => (theme.active == 1), :iconCls => 'icon-content', :isTheme => true, :id => theme.id, :children => []}
+            @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] << {:text => resource_folder, :iconCls => 'icon-content', :id => "#{theme.url}/#{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
-              themes_hash[:children] << theme_hash
+
+              tree << theme_hash
             end
-            site_hash[:children] << themes_hash
-            tree << site_hash
           end
 
           render :json => tree
         end
 
-        def set_website
-          @website = Website.find(params[:site_id])
-        end
-
         def set_theme
           @theme = Theme.find(params[:theme_id])
         end
@@ -355,8 +352,14 @@ module Knitkit
         def set_file_support
           @file_support = ErpTechSvcs::FileSupport::Base.new(:storage => ErpTechSvcs::Config.file_storage)
         end
-  
-      end#ThemeController
-    end#Desktop
-  end#ErpApp
-end#Knitkit
+
+        def set_website
+          if params[:website_id]
+            @website = Website.find(params[:website_id])
+          end
+        end
+
+      end #ThemeController
+    end #Desktop
+  end #ErpApp
+end #Knitkit