From 236bdd2d9cd19df3a945b9f4bb620b1cccb7cfdc Mon Sep 17 00:00:00 2001
From: Hector Cortez <hector@colosa.com>
Date: Fri, 20 Jan 2012 10:07:57 -0400
Subject: [PATCH] BUG 8260 Adjustment in Confirmation to drag and drop a user
 defined field.

---
 .../engine/templates/pmTables/editReport.js   | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/workflow/engine/templates/pmTables/editReport.js b/workflow/engine/templates/pmTables/editReport.js
index 7ae345bdd..bf560ca70 100755
--- a/workflow/engine/templates/pmTables/editReport.js
+++ b/workflow/engine/templates/pmTables/editReport.js
@@ -202,7 +202,7 @@ Ext.onReady(function(){
     listeners:{
       selectionchange: function(sm){
           switch(sm.getCount()){
-            case 0: 
+            case 0:
               Ext.getCmp('removeButton').disable(); 
               Ext.getCmp('removeColumn').disable();
               break;
@@ -214,7 +214,7 @@ Ext.onReady(function(){
                 Ext.getCmp('removeColumn').enable();
               }
               break;
-            default: 
+            default:
               Ext.getCmp('removeButton').enable();
               Ext.getCmp('removeColumn').disable();
               break;
@@ -1229,8 +1229,10 @@ function setReportFields(records) {
 function unsetReportFields(records) {
   mainMask.show();
 
-  var PMRow = availableGrid.getStore().recordType;
-  var indexes = new Array();
+  var PMRow         = availableGrid.getStore().recordType;
+  var indexes       = new Array();
+  var recordsUsrDef = new Array();
+  var fieldName     = '';
 
   for (i=0; i < records.length; i++) {
     if (records[i].data['field_dyn'] != '') {
@@ -1248,11 +1250,27 @@ function unsetReportFields(records) {
       {
         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);
 
+  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) {
     mainMask.hide();
     return;