erp_app 3.0.4 → 3.0.5

data/app/controllers/erp_app/desktop/audit_log_viewer/base_controller.rb

@@ -37,9 +37,9 @@ module ErpApp
 
         def items
           render :json => {:total_count => AuditLog.find(params[:audit_log_id]).items.count,
-                           :audit_log_entries => AuditLog.find(params[:audit_log_id]).items.collect{
+                           :audit_log_items => AuditLog.find(params[:audit_log_id]).items.collect{
                                |audit_log_item| audit_log_item.to_hash(:only => [:id, :description, :created_at, :audit_log_id],
-                                                             :additional_values => {:value => audit_log.audit_log_item_value,
+                                                             :additional_values => {:value => audit_log_item.audit_log_item_value,
                                                                                     :audit_log_item_type => audit_log_item.type.description})}}
         end
 

data/lib/erp_app/version.rb

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

data/public/javascripts/erp_app/desktop/applications/audit_log_viewer/audit_log_grid_panel.js

@@ -74,6 +74,7 @@ Ext.define('Compass.ErpApp.Desktop.Applications.AuditLogViewer.AuditLogGrid', {
     alias:'widget.audit_log_viewer-audit_log_grid',
     extend:'Ext.grid.Panel',
     title:'Audit Log Records',
+	autoScroll:true,
     store:Ext.getStore('audit-log-view-audit-log-entry-store'),
     dockedItems:[
         {

data/public/javascripts/erp_app/desktop/applications/audit_log_viewer/audit_log_item_grid_panel.js

@@ -54,6 +54,7 @@ Ext.define('Compass.ErpApp.Desktop.Applications.AuditLogViewer.AuditLogItemGrid'
     alias:'widget.audit_log_viewer-audit_log_item_grid',
     extend:'Ext.grid.Panel',
     title:'Audit Log Items',
+	autoScroll:true,
     store:Ext.getStore('audit-log-view-audit-log-item-store'),
     columns:[
         {
@@ -68,27 +69,27 @@ Ext.define('Compass.ErpApp.Desktop.Applications.AuditLogViewer.AuditLogItemGrid'
             width:75
         },
         {
-            header:'Description',
-            dataIndex:'description',
-            sortable:false,
-            width:300
-        },
+            header:'Audit Log Item Type',
+            dataIndex:'audit_log_item_type',
+            width:200
+	    },
         {
             header:'Value',
             dataIndex:'value',
             sortable:false,
             width:300
         },
+		{
+            header:'Description',
+            dataIndex:'description',
+            sortable:false,
+            width:200
+	    },
         {
             header:'Created At',
             dataIndex:'created_at',
             renderer:function(value){return Ext.Date.format(value, 'm-d-Y');},
             width:100
-        },
-        {
-            header:'Audit Log Item Type',
-            dataIndex:'audit_log_item_type',
-            width:200
         }
 
     ],

data/public/javascripts/erp_app/desktop/applications/audit_log_viewer/module.js

@@ -1,7 +1,8 @@
 Ext.define("Compass.ErpApp.Desktop.Applications.AuditLogViewer.TabPanel", {
     alias:'widget.audit_log_viewer-tabpanel',
     extend:"Ext.tab.Panel",
-    plugins:Ext.create('Ext.ux.TabCloseMenu', {
+    autoScroll:true,
+	plugins:Ext.create('Ext.ux.TabCloseMenu', {
         extraItemsTail:[
             '-',
             {
@@ -60,7 +61,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.AuditLogViewer", {
                             {
                                 closable:true,
                                 listeners:{
-                                    'render':function(comp){
+                                    'afterrender':function(comp){
                                         comp.getStore().load({params:{audit_log_id:auditLogEntry.get('id')}});
                                     }
                                 }
@@ -75,13 +76,15 @@ Ext.define("Compass.ErpApp.Desktop.Applications.AuditLogViewer", {
             win = desktop.createWindow({
                 id:'audit_log_viewer',
                 title:'Audit Log Viewer',
+				layout:'fit',
+				autoScroll:true,
                 width:1000,
                 height:540,
                 iconCls:'icon-history',
                 shim:false,
+				autoScroll:true,
                 animCollapse:false,
                 constrainHeader:true,
-                layout:'fit',
                 items:[container]
             });
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erp_app
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70353213158540 !ruby/object:Gem::Requirement
+  requirement: &70320719949660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70353213158540
+  version_requirements: *70320719949660
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &70353213157940 !ruby/object:Gem::Requirement
+  requirement: &70320719949040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70353213157940
+  version_requirements: *70320719949040
 - !ruby/object:Gem::Dependency
   name: erp_tech_svcs
-  requirement: &70353213157320 !ruby/object:Gem::Requirement
+  requirement: &70320719948420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70353213157320
+  version_requirements: *70320719948420
 - !ruby/object:Gem::Dependency
   name: erp_dev_svcs
-  requirement: &70353213156460 !ruby/object:Gem::Requirement
+  requirement: &70320719947640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70353213156460
+  version_requirements: *70320719947640
 description: Provides an application infrastructure based on the Sencha/extjs UI framework,
   as well as several utilities and example applications. It houses the core application
   container framework and component model infrastructure that play a key role in the