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

MT-85: The same validation has been added to the keep uid process.

Browse Source
This commit is contained in:
Gustavo Adolfo Cruz Laura
2016-04-02 11:05:12 -04:00
parent f20b3dd48a
commit 92fadecf9b
2 changed files with 28 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/src/ProcessMaker/Importer/Importer.php
View File

@@ -234,7 +234,7 @@ abstract class Importer
$granularObj = new \ProcessMaker\BusinessModel\Migrator\GranularImporter(); $granularObj = new \ProcessMaker\BusinessModel\Migrator\GranularImporter();
$newObjectArray = $objectsToImport; $newObjectArray = $objectsToImport;
$projectUid = $this->importData['tables']['bpmn']["project"][0]["prj_uid"]; $projectUid = $this->importData['tables']['bpmn']["project"][0]["prj_uid"];
$processGranulate = $granularObj->validateImportData($objectsToImport, $generateUid); $processGranulate = $granularObj->validateImportData($objectsToImport);
if($generateUid){ if($generateUid){
$result = $granularObj->regenerateAllUids($this->importData, $generateUid); $result = $granularObj->regenerateAllUids($this->importData, $generateUid);
$this->importData = $result['data']; $this->importData = $result['data'];

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

@@ -8,9 +8,6 @@ var processesGrid,
winDesigner, winDesigner,
newTypeProcess, newTypeProcess,
affectedGroups, affectedGroups,
exportButton,
exportMenu,
exportComponent,
processObjectsArray; processObjectsArray;
/** /**
@@ -26,56 +23,6 @@ importProcessGlobal.isGranularImport = false;
importProcessGlobal.objectGranularImport; importProcessGlobal.objectGranularImport;
importProcessGlobal.objectsToImport = []; importProcessGlobal.objectsToImport = [];
exportButton = {
id: "export",
disabled: true,
text: _("ID_EXPORT"),
iconCls: "silk-add",
icon: "/images/export.png",
handler: function () {
exportProcess();
}
};
/*----------------------------------********---------------------------------*/
/**Begin enterprise export component**/
exportMenu = {
xtype: "tbsplit",
id: "export",
disabled: true,
text: _("ID_EXPORT"),
iconCls: "silk-add",
icon: "/images/export.png",
menu: [
{
text: _("ID_NORMAL_EXPORT"),
iconCls: "silk-add",
icon: "",
handler: function ()
{
exportProcess();
}
}, {
text: _("ID_GRANULAR_EXPORT"),
iconCls: "silk-add",
icon: "",
handler: function ()
{
exportImportProcessObjects('export');
}
}
]
};
/**End enterprise export component**/
/*----------------------------------********---------------------------------*/
exportComponent = exportButton;
/*----------------------------------********---------------------------------*/
/**Begin enterprise component assignment**/
exportComponent = exportMenu;
/**End enterprise component assignment**/
/*----------------------------------********---------------------------------*/
new Ext.KeyMap(document, { new Ext.KeyMap(document, {
key: Ext.EventObject.F5, key: Ext.EventObject.F5,
fn: function(keycode, e) { fn: function(keycode, e) {
@@ -408,9 +355,33 @@ Ext.onReady(function(){
handler:deleteProcess handler:deleteProcess
},{ },{
xtype: 'tbseparator' xtype: 'tbseparator'
}, },{
exportComponent xtype: "tbsplit",
,{ id: "export",
disabled: true,
text: _("ID_EXPORT"),
iconCls: "silk-add",
icon: "/images/export.png",
menu: [
{
text: _("ID_NORMAL_EXPORT"),
iconCls: "silk-add",
icon: "",
handler: function ()
{
exportProcess();
}
}, {
text: _("ID_GRANULAR_EXPORT"),
iconCls: "silk-add",
icon: "",
handler: function ()
{
exportImportProcessObjects('export');
}
}
]
},{
text: _('ID_IMPORT'), text: _('ID_IMPORT'),
iconCls: 'silk-add', iconCls: 'silk-add',
icon: '/images/import.gif', icon: '/images/import.gif',