fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 8260 Adjustment in Confirmation to drag and drop a user defined field.

Browse Source
This commit is contained in:
Hector Cortez
2012-01-20 10:07:57 -04:00
parent a40db2bd9d
commit 236bdd2d9c
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
workflow/engine/templates/pmTables/editReport.js
View File

@@ -202,7 +202,7 @@ Ext.onReady(function(){
listeners:{ listeners:{
selectionchange: function(sm){ selectionchange: function(sm){
switch(sm.getCount()){ switch(sm.getCount()){
case 0: case 0:
Ext.getCmp('removeButton').disable(); Ext.getCmp('removeButton').disable();
Ext.getCmp('removeColumn').disable(); Ext.getCmp('removeColumn').disable();
break; break;
@@ -214,7 +214,7 @@ Ext.onReady(function(){
Ext.getCmp('removeColumn').enable(); Ext.getCmp('removeColumn').enable();
} }
break; break;
default: default:
Ext.getCmp('removeButton').enable(); Ext.getCmp('removeButton').enable();
Ext.getCmp('removeColumn').disable(); Ext.getCmp('removeColumn').disable();
break; break;
@@ -1229,8 +1229,10 @@ function setReportFields(records) {
function unsetReportFields(records) { function unsetReportFields(records) {
mainMask.show(); mainMask.show();
var PMRow = availableGrid.getStore().recordType; var PMRow = availableGrid.getStore().recordType;
var indexes = new Array(); var indexes = new Array();
var recordsUsrDef = new Array();
var fieldName = '';
for (i=0; i < records.length; i++) { for (i=0; i < records.length; i++) {
if (records[i].data['field_dyn'] != '') { if (records[i].data['field_dyn'] != '') {
@@ -1248,11 +1250,27 @@ function unsetReportFields(records) {
{ {
records[i] = null; records[i] = null;
} }
else {
if (records[i].data['field_dyn'] == '' || records[i].data['field_dyn'] == null) {
if (fieldName.length > 0) {
fieldName += ', '
}
fieldName += records[i].data['field_name'];
recordsUsrDef.push(records[i]);
records[i] = null;
}
}
} }
} }
Ext.each(records, assignedGrid.store.remove, assignedGrid.store); Ext.each(records, assignedGrid.store.remove, assignedGrid.store);
if (recordsUsrDef.length > 0 ) {
PMExt.confirm(_('ID_CONFIRM'), _('ID_CONFIRM_REMOVE_FIELDS') + ' ' + fieldName + '?', function(){
Ext.each(recordsUsrDef, assignedGrid.store.remove, assignedGrid.store);
});
}
if (indexes.length == 0) { if (indexes.length == 0) {
mainMask.hide(); mainMask.hide();
return; return;