erp_app 3.0.0 → 3.0.1

data/db/data_migrations/upgrade/20120213182651_add_true_north_background.rb

@@ -0,0 +1,16 @@
+class AddTrueNorthBackground
+  
+  def self.up
+    truenorth_background_po = PreferenceOption.create(:description => 'TrueNorth Logo', :internal_identifier => 'truenorth_logo_background', :value => 'truenorth.png')
+    
+    desktop_backgroud_pt = PreferenceType.iid('desktop_background')
+    desktop_backgroud_pt.preference_options << truenorth_background_po
+    desktop_backgroud_pt.default_preference_option = truenorth_background_po
+    desktop_backgroud_pt.save
+  end
+  
+  def self.down
+    PreferenceOption.iid('truenorth_logo_background').destroy
+  end
+
+end

data/db/migrate/20080805000096_base_app_framework.rb

@@ -1,6 +1,6 @@
 class BaseAppFramework < ActiveRecord::Migration
   def self.up
-    
+
     unless table_exists?(:preferences)
       create_table :preferences do |t|
         t.references :preference_option
@@ -20,7 +20,7 @@ class BaseAppFramework < ActiveRecord::Migration
 
         t.timestamps
       end
-	  
+
       add_index :preference_types, :default_pref_option_id
     end
 
@@ -73,24 +73,12 @@ class BaseAppFramework < ActiveRecord::Migration
         t.references :user
         t.string :description
         t.string :internal_identifier
-
-        t.references :app_container_record, :polymorphic => true
+        t.string :type
 
         t.timestamps
       end
       add_index :app_containers, :user_id
-    end
-
-    unless table_exists?(:desktops)
-      create_table :desktops do |t|
-        t.timestamps
-      end
-    end
-
-    unless table_exists?(:organizers)
-      create_table :organizers do |t|
-        t.timestamps
-      end
+      add_index :app_containers, :type
     end
 
     unless table_exists?(:applications)
@@ -100,8 +88,8 @@ class BaseAppFramework < ActiveRecord::Migration
         t.column :internal_identifier,   :string
         t.column :javascript_class_name, :string
         t.column :shortcut_id,           :string
+        t.column :base_url,              :string
         t.column :type,                  :string
-        t.column :resource_loader,       :string, :default => 'ErpApp::ApplicationResourceLoader::FileSystemLoader'
 
         t.timestamps
       end
@@ -157,31 +145,135 @@ class BaseAppFramework < ActiveRecord::Migration
       end
       add_index :tree_menu_node_defs, :parent_id
     end
+
+    unless table_exists? :configurations
+      create_table :configurations do |t|
+        #custom columns go here
+        t.string  :description
+        t.string  :internal_identifier
+        t.boolean :active
+
+        t.timestamps
+      end
+    end
+
+    unless table_exists? :valid_configurations
+      create_table :valid_configurations do |t|
+        #foreign keys
+        t.references :configured_item, :polymorphic => true
+        t.references :configuration
+
+        t.timestamps
+      end
+
+      add_index :valid_configurations, [:configured_item_id, :configured_item_type], :name => 'configured_item_poly_idx'
+      add_index :valid_configurations, :configuration_id
+    end
+
+    unless table_exists? :configuration_items
+      create_table :configuration_items do |t|
+        #foreign keys
+        t.references :configuration
+        t.references :configuration_item_type
+        t.references :configuration_option
+
+        t.timestamps
+      end
+
+      add_index :configuration_items, :configuration_id
+      add_index :configuration_items, :configuration_item_type_id
+      add_index :configuration_items, :configuration_option_id
+    end
+
+    unless table_exists? :configuration_item_types
+      create_table :configuration_item_types do |t|
+        #awesome nested set columns
+        t.integer :parent_id
+        t.integer :lft
+        t.integer :rgt
+
+        #custom columns go here
+        t.string     :description
+        t.string     :internal_identifier
+        t.boolean    :allow_user_defined_options, :default => false
+        t.boolean    :is_multi_optional, :default => false
+
+        t.timestamps
+      end
+    end
+
+    unless table_exists?(:configuration_item_types_configurations)
+      create_table :configuration_item_types_configurations, {:id => false} do |t|
+        t.references :configuration_item_type
+        t.references :configuration
+      end
+
+      add_index :configuration_item_types_configurations, :configuration_item_type_id, :name => 'conf_conf_type_id_item_idx'
+      add_index :configuration_item_types_configurations, :configuration_id, :name => 'conf_id_idx'
+      add_index :configuration_item_types_configurations, [:configuration_item_type_id, :configuration_id], :unique => true, :name => 'conf_config_type_uniq_idx'
+    end
+
+    unless table_exists? :configuration_options
+      create_table :configuration_options do |t|
+        #custom columns go here
+        t.string  :description
+        t.string  :internal_identifier
+        t.string  :value
+        t.text    :comment
+        t.boolean :user_defined, :default => false
+
+        t.timestamps
+      end
+
+      add_index :configuration_options, :value
+      add_index :configuration_options, :internal_identifier
+      add_index :configuration_options, :user_defined
+    end
+
+    unless table_exists?(:configuration_item_types_configuration_options)
+      create_table :configuration_item_types_configuration_options do |t|
+        t.references :configuration_item_type
+        t.references :configuration_option
+        t.boolean :is_default, :default => false
+
+        t.timestamps
+      end
+
+      add_index :configuration_item_types_configuration_options, :configuration_item_type_id, :name => 'conf_item_type_conf_opt_id_item_idx'
+      add_index :configuration_item_types_configuration_options, :configuration_option_id, :name => 'conf_item_type_conf_opt_id_opt_idx'
+    end
+
+    unless table_exists?(:configuration_items_configuration_options)
+      create_table :configuration_items_configuration_options, {:id => false} do |t|
+        t.references :configuration_item
+        t.references :configuration_option
+      end
+
+      add_index :configuration_items_configuration_options, :configuration_item_id, :name => 'conf_item_conf_opt_id_item_idx'
+      add_index :configuration_items_configuration_options, :configuration_option_id, :name => 'conf_item_conf_opt_id_opt_idx'
+    end
+
   end
 
   def self.down
     [
-      :preferences,
-      :preference_types,
-      :preference_options,
-      :preference_options_preference_types,
-      :valid_preference_types,
-      :user_preferences,
-      :app_containers,
-      :app_containers_applications,
-      :desktops,
-      :organizers,
+      :preferences,:preference_types,
+      :preference_options,:preference_options_preference_types,
+      :valid_preference_types,:user_preferences,
+      :app_containers,:app_containers_applications,
       :applications_widgets,
-      :applications,
-      :applications_desktops,
-      :desktops,
-      :widgets,
-      :tree_menu_node_defs
+      :applications,:applications_desktops,
+      :desktops,:widgets,:tree_menu_node_defs,
+      :configurations,:configuration_items,
+      :configuration_item_types,:configuration_options,
+      :configuration_item_types_configuration_options,
+      :configuration_items_configuration_options,:configured_items,
+      :configuration_item_types_configurations
     ].each do |tbl|
       if table_exists?(tbl)
         drop_table(tbl)
       end
     end
   end
-  
+
 end

data/db/migrate/20120316152543_add_is_template_to_configurations.rb

@@ -0,0 +1,5 @@
+class AddIsTemplateToConfigurations < ActiveRecord::Migration
+  def change
+    add_column :configurations, :is_template, :boolean, :default => false
+  end
+end

data/db/migrate/20120320182253_update_app_container.rb

@@ -0,0 +1,20 @@
+class UpdateAppContainer < ActiveRecord::Migration
+  def up
+    unless columns(:app_containers).collect {|c| c.name}.include?('type')
+      add_column :app_containers, :type, :string
+
+      execute("UPDATE app_containers SET type = app_container_record_type")
+
+      remove_column :app_containers, :app_container_record_id
+      remove_column :app_containers, :app_container_record_type
+
+      add_index :app_containers, :type
+
+      drop_table :desktops
+      drop_table :organizers
+    end
+  end
+
+  def down
+  end
+end

data/db/migrate/20120325123722_remove_file_system_loader_column.rb

@@ -0,0 +1,9 @@
+class RemoveFileSystemLoaderColumn < ActiveRecord::Migration
+  def up
+    remove_column :applications, :resource_loader if column_exists? :applications, :resource_loader
+  end
+
+  def down
+    add_column :applications, :resource_loader, :default => "ErpApp::ApplicationResourceLoader::FileSystemLoader" unless column_exists? :applications, :resource_loader
+  end
+end

data/db/migrate/20120411151848_add_base_url_to_application.rb

@@ -0,0 +1,5 @@
+class AddBaseUrlToApplication < ActiveRecord::Migration
+  def change
+    add_column :applications, :base_url, :string unless column_exists? :applications, :base_url
+  end
+end

data/db/migrate/20120427000446_add_user_defined_to_config_option.rb

@@ -0,0 +1,17 @@
+class AddUserDefinedToConfigOption < ActiveRecord::Migration
+  
+  def up
+    unless column_exists? :configuration_options, :user_defined
+      add_column :configuration_options, :user_defined, :boolean, :default => false
+
+      add_index :configuration_options, :value
+      add_index :configuration_options, :internal_identifier
+      add_index :configuration_options, :user_defined
+    end
+  end
+  
+  def down
+    #remove data here
+  end
+
+end

data/db/migrate/20120429130430_update_configuration_join_tables.rb

@@ -0,0 +1,16 @@
+class UpdateConfigurationJoinTables < ActiveRecord::Migration
+  def up
+    if column_exists? :configuration_item_types_configurations, :created_at
+      remove_column :configuration_item_types_configurations, :created_at
+      remove_column :configuration_item_types_configurations, :updated_at
+
+      remove_column :configuration_items_configuration_options, :created_at
+      remove_column :configuration_items_configuration_options, :updated_at
+      
+      add_index :configuration_item_types_configurations, [:configuration_item_type_id, :configuration_id], :unique => true, :name => 'conf_config_type_uniq_idx'
+    end
+  end
+
+  def down
+  end
+end

data/db/migrate/upgrade/20120208201934_add_configuration_models.rb

@@ -0,0 +1,109 @@
+class AddConfigurationModels < ActiveRecord::Migration
+  def up
+    unless table_exists? :configurations
+      create_table :configurations do |t|
+        #custom columns go here
+        t.string  :description
+        t.string  :internal_identifier
+        t.boolean :active
+
+        t.timestamps
+      end
+    end
+
+    unless table_exists? :valid_configurations
+      create_table :valid_configurations do |t|
+        #foreign keys
+        t.references :configured_item, :polymorphic => true
+        t.references :configuration
+
+        t.timestamps
+      end
+
+      add_index :valid_configurations, [:configured_item_id, :configured_item_type], :name => 'configured_item_poly_idx'
+      add_index :valid_configurations, :configuration_id
+    end
+
+    unless table_exists? :configuration_items
+      create_table :configuration_items do |t|
+        #foreign keys
+        t.references :configuration
+        t.references :configuration_item_type
+        t.references :configuration_option
+
+        t.timestamps
+      end
+
+      add_index :configuration_items, :configuration_id
+      add_index :configuration_items, :configuration_item_type_id
+      add_index :configuration_items, :configuration_option_id
+    end
+
+    unless table_exists? :configuration_item_types
+      create_table :configuration_item_types do |t|
+        #awesome nested set columns
+        t.integer :parent_id
+        t.integer :lft
+        t.integer :rgt
+
+        #custom columns go here
+        t.string     :description
+        t.string     :internal_identifier
+        t.boolean    :is_multi_optional, :default => false
+        t.references :default_configuration_option
+
+        t.timestamps
+      end
+
+      add_index :configuration_item_types, :default_configuration_option_id, :name => 'configuration_item_dflt_opt_idx'
+    end
+
+    unless table_exists? :configuration_options
+      create_table :configuration_options do |t|
+        #custom columns go here
+        t.string :description
+        t.string :internal_identifier
+        t.string :value
+        t.text   :comment
+
+        t.timestamps
+      end
+    end
+
+    unless table_exists?(:configuration_item_types_configuration_options)
+      create_table :configuration_item_types_configuration_options, {:id => false} do |t|
+        t.references :configuration_item_type
+        t.references :configuration_option
+
+        t.timestamps
+      end
+
+      add_index :configuration_item_types_configuration_options, :configuration_item_type_id, :name => 'conf_type_conf_opt_id_item_idx'
+      add_index :configuration_item_types_configuration_options, :configuration_option_id, :name => 'conf_type_conf_opt_id_opt_idx'
+    end
+
+    unless table_exists?(:configuration_items_configuration_options)
+      create_table :configuration_items_configuration_options, {:id => false} do |t|
+        t.references :configuration_item
+        t.references :configuration_option
+
+        t.timestamps
+      end
+
+      add_index :configuration_items_configuration_options, :configuration_item_id, :name => 'conf_item_conf_opt_id_item_idx'
+      add_index :configuration_items_configuration_options, :configuration_option_id, :name => 'conf_item_conf_opt_id_opt_idx'
+    end
+  end
+
+  def down
+     [:configurations,:configuration_items,
+      :configuration_item_types,:configuration_options,
+      :configuration_item_types_configuration_options,
+      :configuration_items_configuration_options,:configured_items
+    ].each do |tbl|
+      if table_exists?(tbl)
+        drop_table(tbl)
+      end
+    end
+  end
+end

data/db/migrate/upgrade/20120209194251_add_user_defined_to_config_type.rb

@@ -0,0 +1,5 @@
+class AddUserDefinedToConfigType < ActiveRecord::Migration
+  def change
+    add_column :configuration_item_types, :allow_user_defined_options, :boolean, :default => false unless column_exists? :configuration_item_types, :allow_user_defined_options
+  end
+end

data/db/migrate/upgrade/20120210172929_add_config_types_to_configs.rb

@@ -0,0 +1,23 @@
+class AddConfigTypesToConfigs < ActiveRecord::Migration
+  def change
+    unless table_exists?(:configuration_item_types_configurations)
+      create_table :configuration_item_types_configurations, {:id => false} do |t|
+        t.references :configuration_item_type
+        t.references :configuration
+
+        t.timestamps
+      end
+
+      add_index :configuration_item_types_configurations, :configuration_item_type_id, :name => 'conf_item_type_conf_opt_id_item_idx'
+      add_index :configuration_item_types_configurations, :configuration_id, :name => 'conf_id_idx'
+    end
+
+    unless column_exists? :configuration_item_types_configuration_options, :id
+      add_column :configuration_item_types_configuration_options, :id, :integer
+      add_column :configuration_item_types_configuration_options, :is_default, :boolean, :default => false
+
+      #remove_index :configuration_item_types, 'configuration_item_dflt_opt_idx'
+      remove_column :configuration_item_types, :default_configuration_option_id
+    end
+  end
+end

data/lib/erp_app/application_resource_loader/base_loader.rb

@@ -0,0 +1,17 @@
+require 'action_view'
+
+module ErpApp
+	module ApplicationResourceLoader
+		class BaseLoader
+		  protected
+
+      def sort_files(files)
+        files.collect do |file|
+          value = file.split('.')[1]
+          (value != 'js' ? {:file => file, :value => value.to_i} : {:file => file, :value => 0})
+        end.sort_by{|item| [item[:value]]}.collect{|item| item[:file]}
+      end
+
+		end#BaseLoader
+	end#ApplicationResourceLoader
+end#ErpApp

data/lib/erp_app/application_resource_loader/{file_system_loader.rb → desktop_organizer_loader.rb}

@@ -2,10 +2,7 @@ require 'action_view'
 
 module ErpApp
 	module ApplicationResourceLoader
-		class FileSystemLoader 
-		  @javascripts_folder = nil
-		  @stylesheets_folder = nil
-
+		class DesktopOrganizerLoader < ErpApp::ApplicationResourceLoader::BaseLoader
 		  def initialize(application)
         @application = application
 		  end
@@ -13,7 +10,7 @@ module ErpApp
 		  def locate_resources(resource_type)
         @app_name = @application.internal_identifier
         @app_type = (@application.type == 'DesktopApplication') ? 'desktop' : 'organizer'
-			
+
         locate_resource_files(resource_type)
 		  end
 
@@ -27,11 +24,11 @@ module ErpApp
   			root_and_engines_dirs.each do |engine_dir|
   			  #get all files based on resource type we are loading for the given application type and application
   			  if File.exists? File.join(engine_dir,"public/#{resource_type}/erp_app/#{@app_type}/applications",@app_name)
-  			    application_path = File.join(engine_dir,"public/#{resource_type}/erp_app/#{@app_type}/applications",@app_name,"*.#{(resource_type == 'javascripts') ? 'js' : 'css'}")
+  			    application_path = File.join(engine_dir,"public/#{resource_type}/erp_app/#{@app_type}/applications",@app_name,"**/*.#{(resource_type == 'javascripts') ? 'js' : 'css'}")
   			    application_files = application_files | Dir.glob(application_path)
   			  end
   			end
-  			application_files = application_files.collect{|file| File.basename(file)}
+  			application_files = sort_files(application_files.collect{|file| File.basename(file)})
 
   			#make sure the base js file is loaded before all others
   			if resource_type == 'javascripts' && (application_files.index{|x| x =~ /module.js/} || application_files.index{|x| x =~ /base.js/})
@@ -47,37 +44,26 @@ module ErpApp
         engine_extension_files = []
   			engine_dirs.each do |engine_dir|
   			  #get all files based on resource type we are loading for the given application type and application
-  			  if File.exists? File.join(engine_dir,"public/#{resource_type}/compass_ae_extensions/erp_app/#{@app_type}/applications",@app_name)
-  			    application_path = File.join(engine_dir,"public/#{resource_type}/compass_ae_extensions/erp_app/#{@app_type}/applications",@app_name,"*.#{(resource_type == 'javascripts') ? 'js' : 'css'}")
+  			  if File.exists? File.join(engine_dir,"public/#{resource_type}/extensions/compass_ae/erp_app/#{@app_type}/applications",@app_name)
+  			    application_path = File.join(engine_dir,"public/#{resource_type}/extensions/compass_ae/erp_app/#{@app_type}/applications",@app_name,"**/*.#{(resource_type == 'javascripts') ? 'js' : 'css'}")
   			    engine_extension_files = engine_extension_files | Dir.glob(application_path)
   			  end
   			end
-  			engine_extension_files = engine_extension_files.collect{|file| File.basename(file)}
-        engine_extension_files.map!{|file| "compass_ae_extensions/erp_app/#{@app_type}/applications/#{@app_name}/#{file}"}
+  			engine_extension_files = sort_files(engine_extension_files.collect{|file| File.basename(file)})
+        engine_extension_files.map!{|file| "extensions/compass_ae/erp_app/#{@app_type}/applications/#{@app_name}/#{file}"}
 
         #get any extension from root rails app
         root_extension_files = []
-        if File.exists? File.join(Rails.root,"public/#{resource_type}/#{Rails.configuration.erp_app.compass_ae_erp_app_extensions_directory}/erp_app", @app_type, 'applications', @app_name)
-          application_path = File.join(Rails.root,"public/#{resource_type}/#{Rails.configuration.erp_app.compass_ae_erp_app_extensions_directory}/erp_app", @app_type, 'applications', @app_name,"*.#{(resource_type == 'javascripts') ? 'js' : 'css'}")
+        if File.exists? File.join(Rails.root,"public/#{resource_type}/extensions/compass_ae/erp_app", @app_type, 'applications', @app_name)
+          application_path = File.join(Rails.root,"public/#{resource_type}/extensions/compass_ae/erp_app", @app_type, 'applications', @app_name,"**/*.#{(resource_type == 'javascripts') ? 'js' : 'css'}")
           root_extension_files = root_extension_files | Dir.glob(application_path)
         end
-        root_extension_files = root_extension_files.collect{|file| File.basename(file)}
-        root_extension_files.map!{|file| "compass_ae_extensions/erp_app/#{@app_type}/applications/#{@app_name}/#{file}"}
+        root_extension_files = sort_files(root_extension_files.collect{|file| File.basename(file)})
+        root_extension_files.map!{|file| "extensions/compass_ae/erp_app/#{@app_type}/applications/#{@app_name}/#{file}"}
 
-				# get shared resources (global js and css)		
-  			shared_files = []
-  			root_and_engines_dirs.each do |engine_dir|
-    			if File.exists? File.join(engine_dir,"public/#{resource_type}/erp_app/shared",@app_name)
-    		    application_path = File.join(engine_dir,"public/#{resource_type}/erp_app/shared",@app_name,"*.#{(resource_type == 'javascripts') ? 'js' : 'css'}")
-    		    shared_files = shared_files | Dir.glob(application_path)
-    		  end
-        end
-		    shared_files = shared_files.collect{|file| File.basename(file)}
-  			shared_files.map!{|file| "erp_app/shared/#{@app_name}/#{file}"}
-        
-		    (application_files + engine_extension_files + root_extension_files + shared_files)
+		    (application_files + engine_extension_files + root_extension_files)
 		  end
-      
-		end#FileSystemLoader
+
+		end#DesktopOrganizerLoader
 	end#ApplicationResourceLoader
 end#ErpApp

data/lib/erp_app/application_resource_loader/mobile_loader.rb

@@ -0,0 +1,46 @@
+require 'action_view'
+
+module ErpApp
+  module ApplicationResourceLoader
+		class MobileLoader < ErpApp::ApplicationResourceLoader::BaseLoader
+      
+		  def initialize(application)
+        @application = application
+		  end
+
+		  def locate_resources(resource_type)
+        @app_name = @application.internal_identifier
+
+        locate_resource_files(resource_type)
+		  end
+
+		  private
+
+		  def locate_resource_files(resource_type)
+  		  engine_dirs = Rails::Application::Railties.engines.map{|p| p.config.root.to_s}
+        root_and_engines_dirs = ([Rails.root] | engine_dirs)
+
+        application_files = []
+  			root_and_engines_dirs.each do |engine_dir|
+  			  #get all files based on resource type we are loading for the given application type and application
+  			  path = File.join(engine_dir,"public/#{resource_type}/erp_app/mobile/applications",@app_name)
+          if File.exists? path
+  			    application_path = File.join(path,"**/*.#{(resource_type == 'javascripts') ? 'js' : 'css'}")
+  			    application_files = application_files | Dir.glob(application_path)
+            application_files.map!{|file| file.gsub(path,'')}
+  			  end
+  			end
+
+        #make sure the base js file is loaded before all others
+  			if resource_type == 'javascripts' && (application_files.index{|x| x =~ /app.js/})
+  			  index = application_files.index{|x| x =~ /app.js/}
+  			  first_load_js = application_files[index]
+  			  application_files.delete_at(index)
+  			  application_files.push(first_load_js)
+  			end
+        application_files.map!{|file| File.join("erp_app/mobile/applications",@app_name,file)}
+		  end
+
+		end#MobileLoader
+  end#ApplicationResourceLoader
+end#ErpApp

data/lib/erp_app/application_resource_loader/shared_loader.rb

@@ -0,0 +1,26 @@
+require 'action_view'
+
+module ErpApp
+  module ApplicationResourceLoader
+		class SharedLoader < ErpApp::ApplicationResourceLoader::BaseLoader
+      
+		  def locate_shared_files(resource_type, folder='shared')
+  		  engine_dirs = Rails::Application::Railties.engines.map{|p| p.config.root.to_s}
+        root_and_engines_dirs = ([Rails.root] | engine_dirs)
+
+				# get shared resources (global js and css)
+  			shared_files = []
+  			root_and_engines_dirs.each do |engine_dir|
+    			if File.exists? File.join(engine_dir,"public/#{resource_type.to_s}/erp_app", folder)
+    		    shared_path = File.join(engine_dir,"public/#{resource_type.to_s}/erp_app", folder,"**/*.#{(resource_type == :javascripts) ? 'js' : 'css'}")
+    		    paths = Dir.glob(shared_path)
+            shared_files = (shared_files | paths.collect{|path| path.gsub(File.join(engine_dir,'public',resource_type.to_s,'/'),'')}).flatten
+    		  end
+        end
+
+		    shared_files = sort_files(shared_files)
+		  end
+
+		end#SharedLoader
+  end#ApplicationResourceLoader
+end#ErpApp

data/lib/erp_app/application_resource_loader.rb

@@ -0,0 +1,4 @@
+require 'erp_app/application_resource_loader/base_loader'
+require 'erp_app/application_resource_loader/desktop_organizer_loader'
+require 'erp_app/application_resource_loader/mobile_loader'
+require 'erp_app/application_resource_loader/shared_loader'

data/lib/erp_app/config.rb

@@ -1,10 +1,10 @@
 module ErpApp
   module Config
     class << self
-      attr_accessor :compass_ae_erp_app_extensions_directory
+      attr_accessor :widgets
 
       def init!
-        @defaults = {:@compass_ae_erp_app_extensions_directory => nil}
+        @defaults = {:@widgets => []}
       end
 
       def reset!

data/lib/erp_app/engine.rb

@@ -4,15 +4,16 @@ module ErpApp
   class Engine < Rails::Engine
     isolate_namespace ErpApp
 
+    Mime::Type.register "json/tree", :tree
+
     config.erp_app = ErpApp::Config
-    
+
 	  initializer "erp_app_assets.merge_public" do |app|
       app.middleware.insert_before Rack::Lock, ::ActionDispatch::Static, "#{root}/public"
     end
     
 	  ActiveSupport.on_load(:active_record) do
       include ErpApp::Extensions::ActiveRecord::HasUserPreferences
-      include ErpApp::Extensions::ActiveRecord::ActsAsAppContainer
     end
 	  
 	  ActiveSupport.on_load(:action_controller) do
@@ -22,9 +23,11 @@ module ErpApp
 	  #add observers
 	  #this is ugly need a better way
 	  (config.active_record.observers.nil?) ? config.active_record.observers = [:user_app_container_observer] : config.active_record.observers << :user_app_container_observer
-		  
+
+    engine = self
   	config.to_prepare do 
-  	  Rails::Engine.load_widgets
+      ErpBaseErpSvcs.register_compass_ae_engine(engine)
+      ::ErpApp::Widgets::Loader.load_root_widgets
 
       #will_paginate patch
       require 'erp_app/extensions/will_paginate_patch'