erp_app 3.0.5 → 3.0.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. data/lib/erp_app/version.rb +1 -1
  2. data/public/javascripts/erp_app/desktop/applications/audit_log_viewer/audit_log_grid_panel.js +48 -52
  3. metadata +9 -9
data/lib/erp_app/version.rb CHANGED
@@ -2,7 +2,7 @@ module ErpApp
2
2
  module VERSION #:nodoc:
3
3
  MAJOR = 3
4
4
  MINOR = 0
5
- TINY = 5
5
+ TINY = 6
6
6
 
7
7
  STRING = [MAJOR, MINOR, TINY].compact.join('.')
8
8
  end
data/public/javascripts/erp_app/desktop/applications/audit_log_viewer/audit_log_grid_panel.js CHANGED
@@ -76,60 +76,56 @@ Ext.define('Compass.ErpApp.Desktop.Applications.AuditLogViewer.AuditLogGrid', {
76
76
  title:'Audit Log Records',
77
77
  autoScroll:true,
78
78
  store:Ext.getStore('audit-log-view-audit-log-entry-store'),
79
- dockedItems:[
80
- {
81
- xtype:'toolbar',
82
- dock:'top',
83
- items:[
84
- 'Start Date:',
85
- {
86
- xtype:'datefield',
87
- itemId:'startDate',
88
- value:new Date()
79
+ tbar:{
80
+ items:[
81
+ 'Start Date:',
82
+ {
83
+ xtype:'datefield',
84
+ itemId:'startDate',
85
+ value:new Date()
89
86
 
90
- },
91
- 'End Date:',
92
- {
93
- xtype:'datefield',
94
- itemId:'endDate',
95
- value:new Date()
96
- },
97
- 'Audit Log Type',
98
- {
99
- xtype:'combo',
100
- itemId:'auditLogTypeId',
101
- store:Ext.getStore('audit-log-view-audit-log-type-store'),
102
- queryMode:'remote',
103
- displayField:'description',
104
- valueField:'id'
105
- },
106
- {
107
- xtype:'button',
108
- text:'Search',
109
- iconCls:'icon-search',
110
- handler:function (btn) {
111
- var startDate = btn.up('toolbar').down('#startDate').getValue();
112
- var endDate = btn.up('toolbar').down('#endDate').getValue();
113
- var auditLogTypeId = btn.up('toolbar').down('#auditLogTypeId').getValue();
87
+ },
88
+ 'End Date:',
89
+ {
90
+ xtype:'datefield',
91
+ itemId:'endDate',
92
+ value:new Date()
93
+ },
94
+ 'Audit Log Type',
95
+ {
96
+ xtype:'combo',
97
+ itemId:'auditLogTypeId',
98
+ store:Ext.getStore('audit-log-view-audit-log-type-store'),
99
+ queryMode:'remote',
100
+ displayField:'description',
101
+ valueField:'id'
102
+ },
103
+ {
104
+ xtype:'button',
105
+ text:'Search',
106
+ iconCls:'icon-search',
107
+ handler:function (btn) {
108
+ var startDate = btn.up('toolbar').down('#startDate').getValue();
109
+ var endDate = btn.up('toolbar').down('#endDate').getValue();
110
+ var auditLogTypeId = btn.up('toolbar').down('#auditLogTypeId').getValue();
114
111
 
115
- var store = btn.up('toolbar').up('audit_log_viewer-audit_log_grid').getStore();
116
- store.currentPage = 1;
117
- store.load({params:{start:0, start_date:startDate, end_date:endDate, audit_log_type_id:auditLogTypeId}});
118
- }
119
- },
120
- {
121
- xtype:'button',
122
- text:'All',
123
- iconCls:'icon-eye',
124
- handler:function (btn) {
125
- var store = btn.up('toolbar').up('audit_log_viewer-audit_log_grid').getStore();
126
- store.currentPage = 1;
127
- store.load({params:{start:0, start_date:null, end_date:null, audit_log_type_id:null}});
128
- }
129
- }
130
- ]
131
- }
132
- ],
112
+ var store = btn.up('toolbar').up('audit_log_viewer-audit_log_grid').getStore();
113
+ store.currentPage = 1;
114
+ store.load({params:{start:0, start_date:startDate, end_date:endDate, audit_log_type_id:auditLogTypeId}});
115
+ }
116
+ },
117
+ {
118
+ xtype:'button',
119
+ text:'All',
120
+ iconCls:'icon-eye',
121
+ handler:function (btn) {
122
+ var store = btn.up('toolbar').up('audit_log_viewer-audit_log_grid').getStore();
123
+ store.currentPage = 1;
124
+ store.load({params:{start:0, start_date:null, end_date:null, audit_log_type_id:null}});
125
+ }
126
+ }
127
+ ]
128
+ },
133
129
  columns:[
134
130
  {
135
131
  header:'Log Id',
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: erp_app
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.5
4
+ version: 3.0.6
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-06-27 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: will_paginate
16
- requirement: &70320719949660 !ruby/object:Gem::Requirement
16
+ requirement: &70154516008580 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - =
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 3.0.2
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70320719949660
24
+ version_requirements: *70154516008580
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: uglifier
27
- requirement: &70320719949040 !ruby/object:Gem::Requirement
27
+ requirement: &70154516008000 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 1.0.3
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70320719949040
35
+ version_requirements: *70154516008000
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: erp_tech_svcs
38
- requirement: &70320719948420 !ruby/object:Gem::Requirement
38
+ requirement: &70154516007380 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '3.0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70320719948420
46
+ version_requirements: *70154516007380
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: erp_dev_svcs
49
- requirement: &70320719947640 !ruby/object:Gem::Requirement
49
+ requirement: &70154516006620 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,7 +54,7 @@ dependencies:
54
54
  version: '3.0'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *70320719947640
57
+ version_requirements: *70154516006620
58
58
  description: Provides an application infrastructure based on the Sencha/extjs UI framework,
59
59
  as well as several utilities and example applications. It houses the core application
60
60
  container framework and component model infrastructure that play a key role in the