diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularImporter.php b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularImporter.php index 46e66ed9f..5f6bc2990 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularImporter.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularImporter.php @@ -88,6 +88,27 @@ class GranularImporter $data['tables']['workflow']['filesManager'] : ''; $objectList['FILES']['PATH'] = isset($data['files']['workflow']) ? $data['files']['workflow'] : ''; break; + case 'DBCONNECTION': + case 'DBCONNECTIONS': + $objectList['DBCONNECTION'] = isset($data['tables']['workflow']['dbconnections']) ? + $data['tables']['workflow']['dbconnections'] : ''; + break; + case 'PERMISSIONS': + $objectList['PERMISSIONS'] = isset($data['tables']['workflow']['objectPermissions']) ? + $data['tables']['workflow']['objectPermissions'] : ''; + break; + case 'SUPERVISORS': + $objectList['SUPERVISORS'] = isset($data['tables']['workflow']['processUser']) ? + $data['tables']['workflow']['processUser'] : ''; + break; + case 'SUPERVISORSOBJECTS': + $objectList['SUPERVISORSOBJECTS'] = isset($data['tables']['workflow']['stepSupervisor']) ? + $data['tables']['workflow']['stepSupervisor'] : ''; + break; + case 'REPORTTABLES': + $objectList['REPORTTABLES'] = isset($data['tables']['workflow']['reportTables']) ? + $data['tables']['workflow']['reportTables'] : ''; + break; default: break; } diff --git a/workflow/engine/templates/processes/main.js b/workflow/engine/templates/processes/main.js index 8551524fd..8370891e9 100755 --- a/workflow/engine/templates/processes/main.js +++ b/workflow/engine/templates/processes/main.js @@ -1066,17 +1066,16 @@ function exportImportProcessObjects(typeAction) } else { /*import*/ colModel.setHidden(3, false); grid.store.on('load', function(store, records, options){ - var gridStore = grid.getStore(); - gridStore.each(function(row, j){ + grid.getSelectionModel().selectAll(); + store.each(function(row, j){ if(inArray(row.get('OBJECT_ID'),importProcessGlobal.objectGranularImport)) { //grid.getSelectionModel().selectRow(j, true); } else { /*disable row*/ - gridStore.remove(row); - /* gridStore.rejectChanges(row); + store.remove(row); + /* store.rejectChanges(row); row.cancelEdit();*/ } - grid.getSelectionModel().selectRow(j, true); }); }); } @@ -1101,6 +1100,15 @@ function exportImportProcessObjects(typeAction) text : buttonLabel, handler : function() { var selectedObjects = gridProcessObjects.getSelectionModel().getSelections(); + if(selectedObjects.length < 1) { + Ext.Msg.show({ + title: _("ID_INFORMATION"), + msg: _("ID_NO_SELECTION_WARNING"), + icon: Ext.MessageBox.INFO, + buttons: Ext.MessageBox.OK + }); + return; + } processObjectsArray = []; if(defaultTypeAction === 'export') { if(selectedObjects.length > 0) { @@ -1512,6 +1520,10 @@ importProcessExistProcess = function() name : 'processFileType', xtype : 'hidden', value : processFileType + }, { + name : 'objectsToImport', + xtype : 'hidden', + value : importProcessGlobal.objectsToImport }, { xtype : 'spacer', height : 10