erp_app 3.0.13 → 3.0.14

data/db/data_migrations/20111108183740_add_new_contact_widgets.rb

@@ -2,19 +2,17 @@ class AddNewContactWidgets
   
   def self.up
     crm_app = OrganizerApplication.find_by_internal_identifier('crm')
+     
     unless crm_app.nil?
       Widget.find_by_internal_identifier('party_contact_management').destroy
 
-      phone_number_managementt_widget = ::Widget.create(
+      phone_number_managementt_widget = ::Widget.create(     
         :description => 'Phone Number Management',
-        :icon => 'icon-grid',
+        :icon => 'icon-grid',     
         :xtype => 'phonenumbergrid',
         :internal_identifier => 'phone_number_management'
       )
 
-      phone_number_managementt_widget.add_role('admin')
-      phone_number_managementt_widget.add_role('employee')
-
       email_address_management_widget = ::Widget.create(
         :description => 'Email Address Management',
         :icon => 'icon-grid',
@@ -22,9 +20,6 @@ class AddNewContactWidgets
         :internal_identifier => 'email_address_management'
       )
 
-      email_address_management_widget.add_role('admin')
-      email_address_management_widget.add_role('employee')
-
       postal_address_management_widget = ::Widget.create(
         :description => 'Postal Address Management',
         :icon => 'icon-grid',
@@ -32,19 +27,15 @@ class AddNewContactWidgets
         :internal_identifier => 'postal_address_management'
       )
 
-      postal_address_management_widget.add_role('admin')
-      postal_address_management_widget.add_role('employee')
-
       crm_app.widgets << phone_number_managementt_widget
       crm_app.widgets << email_address_management_widget
       crm_app.widgets << postal_address_management_widget
-
       crm_app.save
+
     end
   end
   
   def self.down
-    #remove data here
   end
 
 end

data/db/data_migrations/20120229160222_add_userinfo_widget.rb

@@ -6,19 +6,17 @@ class AddUserinfoWidget
       app = Application.find_by_internal_identifier('crm')
 
       user = Widget.create(
-          :description => 'User Info',
-          :internal_identifier => 'userinfo',
-          :icon => 'icon-user',
-          :xtype => 'userinfo'
-        )
+        :description => 'User Info',
+        :internal_identifier => 'userinfo',
+        :icon => 'icon-user',
+        :xtype => 'userinfo'
+      )
      
       unless app.nil?
         app.widgets << user
         app.save
       end
-      
-      user.roles << Role.find_by_internal_identifier('admin')
-      user.save
+
     end
   end
   

data/db/data_migrations/20120418164215_create_configuration_management_desktop_application.rb

@@ -14,6 +14,10 @@ class CreateConfigurationManagementDesktopApplication
     pt2 = PreferenceType.iid('autoload_application')
     pt2.preferenced_records << app
     pt2.save
+    
+    admin_user = User.find_by_username('admin')
+    admin_user.desktop.applications << app
+    admin_user.desktop.save
   end
 
   def self.down

data/db/data_migrations/20121130201859_upgrade_remove_system_mgmt_app.rb

@@ -0,0 +1,15 @@
+class UpgradeRemoveSystemMgmtApp
+  
+  def self.up
+    #insert data here
+    widget = Widget.find_by_xtype('systemmanagement_applicationrolemanagment')
+    widget.destroy unless widget.nil?
+    app = Application.find_by_internal_identifier('system_management')
+    app.destroy unless app.nil?
+  end
+  
+  def self.down
+    #remove data here
+  end
+
+end

data/db/data_migrations/20121218175028_create_security_management_desktop_application.rb

@@ -0,0 +1,28 @@
+class CreateSecurityManagementDesktopApplication
+  def self.up
+    app = DesktopApplication.create(
+      :description => 'Security Management',
+      :icon => 'icon-key',
+      :javascript_class_name => 'Compass.ErpApp.Desktop.Applications.SecurityManagement',
+      :internal_identifier => 'security_management',
+      :shortcut_id => 'security_management-win'
+    )
+    pt1 = PreferenceType.iid('desktop_shortcut')
+    pt1.preferenced_records << app
+    pt1.save
+
+    pt2 = PreferenceType.iid('autoload_application')
+    pt2.preferenced_records << app
+    pt2.save
+    
+    admin_user = User.find_by_username('admin')
+    if admin_user
+      admin_user.desktop.applications << app
+      admin_user.desktop.save
+    end
+  end
+
+  def self.down
+    DesktopApplication.destroy_all(['internal_identifier = ?','security_management'])
+  end
+end

data/lib/erp_app/engine.rb

@@ -24,13 +24,13 @@ module ErpApp
 	  #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 
-      ErpBaseErpSvcs.register_compass_ae_engine(engine)
-      ::ErpApp::Widgets::Loader.load_root_widgets
+    ErpBaseErpSvcs.register_as_compass_ae_engine(config, self)
+    ::ErpApp::Widgets::Loader.load_root_widgets(config)
 
+  	config.to_prepare do
       #will_paginate patch
       require 'erp_app/extensions/will_paginate_patch'
-  	end
+    end
+
   end
 end

data/lib/erp_app/extensions/railties/action_view/helpers/include_helper.rb

@@ -83,12 +83,13 @@ module ErpApp
                 :lastActivityAt => user.last_activity_at,
                 :failedLoginCount =>  user.failed_logins_count,
                 :email => user.email,
-                :roles => user.roles.collect{|role| role.internal_identifier},
+                :roles => user.all_roles.collect{|role| role.internal_identifier},
+                :capabilities => user.class_capabilities_to_hash,
                 :id => user.id,
                 :description => user.party.to_s
               }
-              js_string = static_javascript_include_tag('erp_app/authentication/compass_user.js', 'erp_app/authentication/widget_manager.js')
-              js_string << (raw "<script type='text/javascript'>var applicationRoleManager = new ErpApp.CompassAccessNegotiator.ApplicationRoleManager(#{app_container.applications.collect{|application| application.to_access_hash}.to_json});var currentUser = new ErpApp.CompassAccessNegotiator.CompassUser(#{current_user.to_json}, applicationRoleManager);</script>")
+              js_string = static_javascript_include_tag('erp_app/authentication/compass_user.js')
+              js_string << (raw "<script type='text/javascript'>var currentUser = new ErpApp.CompassAccessNegotiator.CompassUser(#{current_user.to_json});</script>")
               js_string
             end
 

data/lib/erp_app/extensions/railties/action_view/helpers/tag_helper.rb

@@ -8,12 +8,18 @@ module ErpApp
             include ::ActionView::Helpers::TagHelper
 
             def link_to_remote(name, url, options={})
-              options.merge!({:class => 'ajax_replace', :remote => true})
+              #add ajax_replace class
+              options[:class].nil? ? 'ajax_replace' : "#{options[:class]} ajax_replace"
+              #add remote => true to options
+              options.merge!({:remote => true})
               link_to name, url, options
             end
   
             def form_remote_tag(url, options={}, &block)
-              options.merge!({:class => 'ajax_replace', :remote => true})
+              #add ajax_replace class
+              options[:class].nil? ? 'ajax_replace' : "#{options[:class]} ajax_replace"
+              #add remote => true to options
+              options.merge!({:remote => true})
               form_tag url, options do
                 yield
               end

data/lib/erp_app/version.rb

@@ -2,7 +2,7 @@ module ErpApp
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 0
-    TINY  = 13
+    TINY  = 14
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

data/lib/erp_app/widgets/base.rb

@@ -44,6 +44,10 @@ module ErpApp
         merge_params
       end
 
+      def widget_result_id
+        "#{self.uuid}_result"
+      end
+
       def render(opts={})
         render_view_for(opts, self.view)
       end

data/lib/erp_app/widgets/loader.rb

@@ -2,16 +2,19 @@ module ErpApp
   module Widgets
     class Loader
       class << self
-        def load_compass_ae_widgets(engine)
-          require_widgets_and_helpers(engine.root)
-          load_widget_extensions(engine)
-        end
+        def load_compass_ae_widgets(config, engine)
+          config.send(ErpBaseErpSvcs.determine_callback) do
+            ::ErpApp::Widgets::Loader.require_widgets_and_helpers(engine.root)
+            ::ErpApp::Widgets::Loader.load_widget_extensions(engine)
+          end
 
-        def load_root_widgets
-          require_widgets_and_helpers(Rails.root.to_s)
         end
 
-        private
+        def load_root_widgets(config)
+          config.send(ErpBaseErpSvcs.determine_callback) do
+            ::ErpApp::Widgets::Loader.require_widgets_and_helpers(Rails.root.to_s)
+          end
+        end
 
         def require_widgets_and_helpers(path)
           widgets = []
@@ -38,11 +41,40 @@ module ErpApp
             end
             #get all view files for theme generation
             get_widget_view_files(widget_hash, widget_hash[:view_paths].first)
-            #load any rails root extensions
+
+            #load root widget extensions that should override this widget
             load_root_widget_extensions(widget_hash)
           end
         end
 
+        def load_widget_extensions(engine)
+          widgets_path = File.join(engine.root,"lib",engine.railtie_name,"extensions/widgets")
+          widgets = File.directory?(widgets_path) ? Dir.entries(widgets_path) : []
+          widgets.delete_if{|name| name =~ /^\./}
+
+          widgets.each do |widget_name|
+            widget_hash = Rails.application.config.erp_app.widgets.find{|item| item[:name] == widget_name}
+            #load any extensions to existing widgets
+            Dir.glob(File.join(widgets_path,widget_name,"*.rb")).each do |file|
+              load file
+            end
+
+            #add any additional view paths to widgets
+            if File.directory?(File.join(widgets_path,widget_name,'views'))
+              view_path = File.join(widgets_path,widget_name,'views')
+              widget_hash[:view_paths] << view_path
+              #get all view files for theme generation
+              get_widget_view_files(widget_hash, view_path)
+            end
+
+            #overwrite with any extensions in rails root
+            load_root_widget_extensions(widget_hash)
+          end
+
+        end
+
+        private
+
         def load_widget_view_helpers(path)
           helpers = Dir.entries(path)
           helpers.delete_if{|name| name =~ /^\./}
@@ -77,32 +109,6 @@ module ErpApp
           end
         end
 
-        def load_widget_extensions(engine)
-          widgets_path = File.join(engine.root,"lib",engine.railtie_name,"extensions/widgets")
-          widgets = File.directory?(widgets_path) ? Dir.entries(widgets_path) : []
-          widgets.delete_if{|name| name =~ /^\./}
-
-          widgets.each do |widget_name|
-            widget_hash = Rails.application.config.erp_app.widgets.find{|item| item[:name] == widget_name}
-            #load any extensions to existing widgets
-            Dir.glob(File.join(widgets_path,widget_name,"*.rb")).each do |file|
-              load file
-            end
-
-            #add any additional view paths to widgets
-            if File.directory?(File.join(widgets_path,widget_name,'views'))
-              view_path = File.join(widgets_path,widget_name,'views')
-              widget_hash[:view_paths] << view_path
-              #get all view files for theme generation
-              get_widget_view_files(widget_hash, view_path)
-            end
-
-            #overwrite with any extensions in rails root
-            load_root_widget_extensions(widget_hash)
-          end
- 
-        end
-
         def load_root_widget_extensions(widget_hash)
           if File.directory?(File.join(Rails.root,"lib/extensions/widgets",widget_hash[:name]))
             Dir.glob(File.join(Rails.root,"lib/extensions/widgets",widget_hash[:name],"*.rb")).each do |file|

data/public/javascripts/erp_app/authentication/compass_user.js

@@ -4,16 +4,16 @@ Ext.ns("ErpApp.CompassAccessNegotiator");
  * @class ErpApp.CompassAccessNegotiator.CompassUser
  **/
 
-ErpApp.CompassAccessNegotiator.CompassUser = function(user, applicationRoleManager){
+ErpApp.CompassAccessNegotiator.CompassUser = function(user){
   this.id = user.id,
-  this.roles = user.roles,
   this.username = user.username,
+  this.roles = user.roles,
+  this.capabilities = user.capabilities,
   this.lastloginAt = user.lastloginAt,
   this.lastActivityAt = user.lastActivityAt,
   this.failedLoginCount = user.failedLoginCount,
   this.email = user.email,
-  this.applicationRoleManager = applicationRoleManager,
-  this.description = user.description
+  this.description = user.description;
 
   /**
    * Checks to see if the passed roles exists in this.roles
@@ -44,21 +44,27 @@ ErpApp.CompassAccessNegotiator.CompassUser = function(user, applicationRoleManag
     return result;
   },
 
-  this.hasApplicationCapability = function(application_iid, capability){
-    return this.applicationRoleManager.hasApplicationCapability(application_iid, capability, this);
-  },
+  this.hasCapability = function(capability_type_iid, klass){
+    for(var i = 0; i < this.capabilities.length; i++){
+      if (this.capabilities[i].capability_type_iid == capability_type_iid && this.capabilities[i].capability_resource_type == klass){
+        return true;
+      }
+    }
 
-  this.hasWidgetCapability = function(xtype, capability){
-    return this.applicationRoleManager.hasWidgetCapability(xtype, capability, this);
+    return false;
   },
 
-  this.hasAccessToWidget = function(xtype){
-    return this.applicationRoleManager.hasAccessToWidget(xtype, this);
-  },
+  // this.hasWidgetCapability = function(xtype, capability){
+  //   return this.applicationRoleManager.hasWidgetCapability(xtype, capability, this);
+  // },
 
-  this.validWidgets = function(application_iid, filters){
-    return this.applicationRoleManager.validWidgets(application_iid, filters, this);
-  },
+  // this.hasAccessToWidget = function(xtype){
+  //   return this.applicationRoleManager.hasAccessToWidget(xtype, this);
+  // },
+
+  // this.validWidgets = function(application_iid, filters){
+  //   return this.applicationRoleManager.validWidgets(application_iid, filters, this);
+  // },
 
   /**
    * Use when role check fails, displays message add logging if needed.
@@ -75,9 +81,6 @@ ErpApp.CompassAccessNegotiator.CompassUser = function(user, applicationRoleManag
       fn: options['fn'] || null,
       iconCls:'icon-warning'
     });
-  }
+  };
 
 };
-
-
-