fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'upstream/MT-10' into MT-28

Browse Source
This commit is contained in:
dheeyi
2016-03-23 18:07:22 -04:00
parent 97e543d40c d345a7b122
commit e76390f878
2 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularImporter.php
View File

@@ -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;
}

22
workflow/engine/templates/processes/main.js
View File

@@ -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