From 8e1a15b7dd3eb2b6fb6aea22e31526f8ec6de69a Mon Sep 17 00:00:00 2001 From: Gustavo Adolfo Cruz Laura Date: Wed, 23 Mar 2016 23:28:40 -0400 Subject: [PATCH] Fixes made according to the current code review status. --- workflow/engine/classes/class.processes.php | 16 ++++------ .../Migrator/DBConnectionMigrator.php | 6 ---- .../Migrator/DynaformsMigrator.php | 5 --- .../Migrator/ExportException.php | 6 ---- .../BusinessModel/Migrator/ExportObjects.php | 4 +-- .../BusinessModel/Migrator/FileHandler.php | 5 --- .../BusinessModel/Migrator/FilesMigrator.php | 8 +---- .../Migrator/GranularExporter.php | 3 -- .../Migrator/ImportException.php | 6 ---- .../Migrator/InputDocumentsMigrator.php | 6 ---- .../Migrator/MigratorFactory.php | 6 ---- .../BusinessModel/Migrator/NullMigrator.php | 6 ---- .../Migrator/OutputDocumentsMigrator.php | 6 ---- .../BusinessModel/Migrator/PMXPublisher.php | 8 +---- .../Migrator/PermissionsMigrator.php | 6 ---- .../Migrator/ProcessDefinitionMigrator.php | 6 ---- .../Migrator/ReportTablesMigrator.php | 6 ---- .../Migrator/SupervisorsMigrator.php | 6 ---- .../Migrator/SupervisorsObjectsMigrator.php | 6 ---- .../Migrator/TemplatesMigrator.php | 8 +---- .../Migrator/TriggersMigrator.php | 6 ---- .../src/ProcessMaker/Importer/Importer.php | 1 - workflow/engine/templates/processes/main.js | 32 +++++++++---------- 23 files changed, 28 insertions(+), 140 deletions(-) diff --git a/workflow/engine/classes/class.processes.php b/workflow/engine/classes/class.processes.php index b2a005727..8774f4098 100755 --- a/workflow/engine/classes/class.processes.php +++ b/workflow/engine/classes/class.processes.php @@ -1904,7 +1904,7 @@ class Processes foreach ($aInput as $key => $row) { $oInput = new InputDocument(); if ($oInput->InputExists( $row['INP_DOC_UID'] )) { - $oInput->update( $row ); + $oInput->update($row); } else { $oInput->create($row); } @@ -2019,7 +2019,6 @@ class Processes { foreach ($aOutput as $key => $row) { $oOutput = new OutputDocument(); - //unset ($row['TAS_UID']); if (!$oOutput->OutputExists( $row['OUT_DOC_UID'] )) { $oOutput->update( $row ); } else { @@ -2725,8 +2724,8 @@ class Processes public function createObjectPermissionRows ($aPermission) { try { + $oPermission = new ObjectPermission(); foreach ($aPermission as $key => $row) { - $oPermission = new ObjectPermission(); if ($oPermission->Exists( $row['OP_UID'] )) { $oPermission->remove( $row['OP_UID'] ); } @@ -2744,8 +2743,8 @@ class Processes public function updateObjectPermissionRows ($aPermission) { try { + $oPermission = new ObjectPermission(); foreach ($aPermission as $key => $row) { - $oPermission = new ObjectPermission(); if ($oPermission->Exists( $row['OP_UID'] )) { $oPermission->update( $row['OP_UID'] ); } else { @@ -2809,9 +2808,8 @@ class Processes */ public function updateDynaformRows ($aDynaform) { + $oDynaform = new Dynaform(); foreach ($aDynaform as $key => $row) { - $oDynaform = new Dynaform(); - //unset ($row['TAS_UID']); if (!$oDynaform->exists( $row['DYN_UID'] )) { $res = $oDynaform->update( $row ); } else { @@ -2923,8 +2921,8 @@ class Processes */ public function updateTriggerRows($aTrigger) { + $oTrigger = new Triggers(); foreach ($aTrigger as $key => $row) { - $oTrigger = new Triggers(); if ($oTrigger->TriggerExists($row['TRI_UID'])) { $oTrigger->update($row); } else { @@ -3593,8 +3591,8 @@ class Processes public function updateDBConnectionsRows ($aConnections) { try { + $oConnection = new DbSource(); foreach ($aConnections as $sKey => $aRow) { - $oConnection = new DbSource(); if ($oConnection->Exists( $aRow['DBS_UID'], $aRow['PRO_UID'] )) { $oConnection->update( $aRow ); } else { @@ -3658,7 +3656,7 @@ class Processes $oRep->create( $aRow ); } } - #@!neyek + #@!neyekj /** diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/DBConnectionMigrator.php b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/DBConnectionMigrator.php index bbe9ef452..d334fb663 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/DBConnectionMigrator.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/DBConnectionMigrator.php @@ -1,10 +1,4 @@ objectsList as $key => $val) { - $key++; $grid[] = array( - 'OBJECT_ID' => $key, + 'OBJECT_ID' => $key+1, 'OBJECT_NAME' => $val, 'OBJECT_ACTION' => 1, 'OBJECT_ENABLE' => in_array(strtoupper(str_replace(' ', '',$val)), $aObjectsEnable) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/FileHandler.php b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/FileHandler.php index 83daab025..67fdab26f 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/FileHandler.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/FileHandler.php @@ -1,9 +1,4 @@ truncateName($filename); file_put_contents($outputFile, $data); - chmod($outputFile, 0755); + @chmod($outputFile, 0755); return basename($outputFile); } diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/PermissionsMigrator.php b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/PermissionsMigrator.php index 3703aa672..2b45945f5 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/PermissionsMigrator.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/PermissionsMigrator.php @@ -1,10 +1,4 @@ importData = $this->load(); - //$this->validateImportData(); } public function setData($key, $value) diff --git a/workflow/engine/templates/processes/main.js b/workflow/engine/templates/processes/main.js index 8370891e9..e404342d5 100755 --- a/workflow/engine/templates/processes/main.js +++ b/workflow/engine/templates/processes/main.js @@ -48,6 +48,7 @@ Ext.apply(Ext.form.VTypes, { }); Ext.onReady(function(){ + var i; setExtStateManagerSetProvider('gridProcessMain'); Ext.QuickTips.init(); @@ -213,7 +214,7 @@ Ext.onReady(function(){ arrayMenuNewOption.push(mnuNewProject); } - for (var i = 0; i <= arrayMenuNewOptionPlugin.length - 1; i++) { + for (i = 0; i <= arrayMenuNewOptionPlugin.length - 1; i++) { try { if (typeof(arrayMenuNewOptionPlugin[i].handler) != "undefined") { eval("arrayMenuNewOptionPlugin[i].handler = " + arrayMenuNewOptionPlugin[i].handler + ";"); @@ -535,7 +536,7 @@ Ext.onReady(function(){ } ]; - for (var i = 0; i <= arrayContextMenuOptionPlugin.length - 1; i++) { + for (i = 0; i <= arrayContextMenuOptionPlugin.length - 1; i++) { try { if (typeof(arrayContextMenuOptionPlugin[i].handler) != "undefined") { eval("arrayContextMenuOptionPlugin[i].handler = " + arrayContextMenuOptionPlugin[i].handler + ";"); @@ -764,6 +765,7 @@ editNewProcess = function(){ deleteProcess = function(){ var rows = processesGrid.getSelectionModel().getSelections(); + var i; if( rows.length > 0 ) { isValid = true; errLog = Array(); @@ -1000,8 +1002,8 @@ function exportImportProcessObjects(typeAction) storeActionField = new Ext.data.ArrayStore({ fields: ['value', 'text'], data: [ - [1, 'Add to Existing'], - [2, 'Replace All'] + [1, _('ID_UPDATE')], + [2, _('ID_OVERWRITE')] ] }); checkBoxSelMod = new Ext.grid.CheckboxSelectionModel(); @@ -1054,7 +1056,7 @@ function exportImportProcessObjects(typeAction) return storeActionField.getAt(recordIndex).get('text'); } }, - {header: 'Name', dataIndex: 'OBJECT_ENABLE', hidden: true}, + {header: 'Name', dataIndex: 'OBJECT_ENABLE', hidden: true} ] }), store: storeGrid, @@ -1068,13 +1070,8 @@ function exportImportProcessObjects(typeAction) grid.store.on('load', function(store, records, options){ grid.getSelectionModel().selectAll(); store.each(function(row, j){ - if(inArray(row.get('OBJECT_ID'),importProcessGlobal.objectGranularImport)) { - //grid.getSelectionModel().selectRow(j, true); - } else { - /*disable row*/ + if(!inArray(row.get('OBJECT_ID'),importProcessGlobal.objectGranularImport)) { store.remove(row); - /* store.rejectChanges(row); - row.cancelEdit();*/ } }); }); @@ -1100,6 +1097,7 @@ function exportImportProcessObjects(typeAction) text : buttonLabel, handler : function() { var selectedObjects = gridProcessObjects.getSelectionModel().getSelections(); + var i; if(selectedObjects.length < 1) { Ext.Msg.show({ title: _("ID_INFORMATION"), @@ -1148,8 +1146,9 @@ function exportImportProcessObjects(typeAction) } function inArray(needle, haystack) { + var i; var length = haystack.length; - for(var i = 0; i < length; i++) { + for(i = 0; i < length; i++) { if(haystack[i] == needle) return true; } return false; @@ -1395,9 +1394,10 @@ importProcessExistGroup = function() affectedGroupsList = function() { + var i; var arrayGroups = affectedGroups.split(", "); var tableGroups = "" - for(var i = 0; i < arrayGroups.length; i++) { + for(i = 0; i < arrayGroups.length; i++) { tableGroups += ""; } tableGroups += "
"+arrayGroups[i]+"
"; @@ -1833,7 +1833,7 @@ importProcess = function() importProcessGlobal.groupBeforeAccion = resp_.groupBeforeAccion; importProcessExistGroup(); } - } else if (resp_.ExistProcessInDatabase == "1") { + } else if (resp_.ExistProcessInDatabase === "1") { importProcessGlobal.proFileName = resp_.proFileName; importProcessExistProcess(); } @@ -1995,7 +1995,7 @@ importProcessBpmnSubmit = function () { function activeDeactive(){ var rows = processesGrid.getSelectionModel().getSelections(); - + var i; if( rows.length > 0 ) { var ids = ''; for(i=0; i 0 ) { var ids = ''; for(i=0; i