From 9e5319570a2f107019e5960dec35d1b004bb4431 Mon Sep 17 00:00:00 2001 From: norahmollo Date: Thu, 25 Jul 2013 12:42:56 -0400 Subject: [PATCH 01/11] UnassignedMessage translation added UnassignedMessage translation added --- workflow/engine/classes/class.case.php | 4 ++-- workflow/engine/classes/class.processes.php | 11 +++++---- .../engine/methods/setup/languages_Import.php | 2 +- .../mails/unassignedMessagePartner.html | 24 +++++++++++++++++++ 4 files changed, 34 insertions(+), 7 deletions(-) create mode 100644 workflow/engine/templates/mails/unassignedMessagePartner.html diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php index f5535f389..036c204c3 100755 --- a/workflow/engine/classes/class.case.php +++ b/workflow/engine/classes/class.case.php @@ -4920,10 +4920,10 @@ class Cases case "SELF_SERVICE": if ($swtplDefault == 1) { G::verifyPath($pathEmail, true); //Create if it does not exist - $fileTemplate = $pathEmail . "unassignedMessage.html"; + $fileTemplate = $pathEmail . G::LoadTranslation('ID_UNASSIGNED_MESSAGE'); if (!file_exists($fileTemplate)) { - @copy(PATH_TPL . "mails" . PATH_SEP . "unassignedMessage.html", $fileTemplate); + @copy(PATH_TPL . "mails" . PATH_SEP . G::LoadTranslation('ID_UNASSIGNED_MESSAGE'), $fileTemplate); } $sBody = G::replaceDataField(file_get_contents($fileTemplate), $aFields); diff --git a/workflow/engine/classes/class.processes.php b/workflow/engine/classes/class.processes.php index d688ea0a3..ace53dec5 100755 --- a/workflow/engine/classes/class.processes.php +++ b/workflow/engine/classes/class.processes.php @@ -3866,7 +3866,11 @@ class Processes } if (! file_exists( $dir . "unassignedMessage.html" )) { - @copy( PATH_TPL . "mails" . PATH_SEP . "unassignedMessage.html", $dir . "unassignedMessage.html" ); + if (defined('PARTNER_FLAG')) { + @copy( PATH_TPL . "mails" . PATH_SEP . "unassignedMessagePartner.html", $dir . G::LoadTranslation('ID_UNASSIGNED_MESSAGE')); + } else { + @copy( PATH_TPL . "mails" . PATH_SEP . "unassignedMessage.html", $dir . G::LoadTranslation('ID_UNASSIGNED_MESSAGE')); + } } $files = glob( $dir . "*.*" ); @@ -3874,9 +3878,8 @@ class Processes foreach ($files as $file) { $fileName = basename( $file ); - if ($fileName != "alert_message.html" && $fileName != "unassignedMessage.html") { - $filesList[] = array ("filepath" => $file,"filename" => $fileName - ); + if ($fileName != "alert_message.html" && $fileName != G::LoadTranslation('ID_UNASSIGNED_MESSAGE')) { + $filesList[] = array ("filepath" => $file,"filename" => $fileName); } } return $filesList; diff --git a/workflow/engine/methods/setup/languages_Import.php b/workflow/engine/methods/setup/languages_Import.php index b08fd3844..b79c233ae 100755 --- a/workflow/engine/methods/setup/languages_Import.php +++ b/workflow/engine/methods/setup/languages_Import.php @@ -86,7 +86,7 @@ try { $result->msg .= G::LoadTranslation("ID_FAILED_RECORD") . ($importResults->recordsCount - $importResults->recordsCountSuccess) . "\n"; if ($importResults->errMsg != '') { - $result->msg .= "Errors registered: \n" . $importResults->errMsg . "\n"; + $result->msg .= G::LoadTranslation("ID_ERROR_REGISTERED"). " \n" . $importResults->errMsg . "\n"; } //$result->msg = htmlentities($result->msg); diff --git a/workflow/engine/templates/mails/unassignedMessagePartner.html b/workflow/engine/templates/mails/unassignedMessagePartner.html new file mode 100644 index 000000000..12772d77b --- /dev/null +++ b/workflow/engine/templates/mails/unassignedMessagePartner.html @@ -0,0 +1,24 @@ + + + + + + + + + + +
+ CASO NAO ATRIBUÍDOS +
+
+ O caso #@#APP_NUMBER está disponível na lista não atribuído. +
+
+ Nota: Se você quer reivindicar o caso e ele não está disponível na lista, pode ser já tomadas. +
+
+ Este processo de negócio é alimentado por DocSystem +
+ www.docsystemcorp.com +
\ No newline at end of file From 2e1452d38638d9610e8fc9df7e9cd0ef81f7252f Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Thu, 25 Jul 2013 15:45:42 -0400 Subject: [PATCH 02/11] Comentando Script de insercion en la insatalacion de DocSystem --- workflow/engine/controllers/installer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/controllers/installer.php b/workflow/engine/controllers/installer.php index 551ff5811..b3e6c4924 100755 --- a/workflow/engine/controllers/installer.php +++ b/workflow/engine/controllers/installer.php @@ -736,7 +736,7 @@ class Installer extends Controller if (defined('PARTNER_FLAG') || isset($_REQUEST['PARTNER_FLAG'])) { $this->setPartner(); - $this->setConfiguration(); + //$this->setConfiguration(); } // Create the triggers From 0bbd11b7a006d5640bf29c6bbc51699fc26eb60b Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Fri, 26 Jul 2013 09:22:58 -0400 Subject: [PATCH 03/11] Adicion de hostname para puerto de mysql --- workflow/engine/controllers/installer.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/workflow/engine/controllers/installer.php b/workflow/engine/controllers/installer.php index b3e6c4924..f2a1c2233 100755 --- a/workflow/engine/controllers/installer.php +++ b/workflow/engine/controllers/installer.php @@ -1506,11 +1506,13 @@ class Installer extends Controller $dataPlugin = pathinfo($value); $namePlugin = $dataPlugin['filename']; if ($value != 'enterprise') { - $db_host = trim( $_REQUEST['db_hostname'] ); + $db_hostname = trim( $_REQUEST['db_hostname'] ); + $db_port = trim( $_REQUEST['db_port'] ); $db_username = trim( $_REQUEST['db_username'] ); $db_password = trim( $_REQUEST['db_password'] ); $wf = trim( $_REQUEST['wfDatabase'] ); + $db_host = ($db_port != '' && $db_port != 3306) ? $db_hostname . ':' . $db_port : $db_hostname; $link = @mysql_connect( $db_host, $db_username, $db_password ); @mysql_select_db($wf, $link); $res = mysql_query( "SELECT STORE_ID FROM ADDONS_MANAGER WHERE ADDON_NAME = '" . $namePlugin . "'", $link ); From 6ec83f872e0f85067349881127f5da34a818f8fd Mon Sep 17 00:00:00 2001 From: "@sinedrik" Date: Fri, 26 Jul 2013 13:28:41 -0400 Subject: [PATCH 04/11] FEATURE, adding the posibility to reaload a specif node to cases treePanel, and the xml document built section was refactores using SimpleXMl --- .../engine/methods/cases/casesMenuLoader.php | 71 ++++++++++++++++++- workflow/engine/templates/cases/main.js | 37 ++++++---- 2 files changed, 90 insertions(+), 18 deletions(-) diff --git a/workflow/engine/methods/cases/casesMenuLoader.php b/workflow/engine/methods/cases/casesMenuLoader.php index 4bf88641e..5c0656efd 100755 --- a/workflow/engine/methods/cases/casesMenuLoader.php +++ b/workflow/engine/methods/cases/casesMenuLoader.php @@ -68,8 +68,73 @@ function getLoadTreeMenuData () } } } - //now build the menu in xml format - $xml = ''; + + // Build xml nodes for a specific child node by its "id" on var "$_POST['node']" passed in a POST request + if (isset($_POST['node']) && in_array($_POST['node'], array_keys($menuCases))) { + $xml = new SimpleXMLElement(''); + + if (array_key_exists('blockItems', $menuCases[$_POST['node']]) && is_array($menuCases[$_POST['node']]['blockItems'])) { + foreach ($menuCases[$_POST['node']]['blockItems'] as $key => $item) { + $option = $xml->addChild('option'); + $option->addAttribute('id', $key); + $option->addAttribute('title', $item['label']); + $option->addAttribute('url', $item['link']); + + if (! empty($item['cases_count'])) { + $option->addAttribute('cases_count', $item['cases_count']); + } + } + } + + echo $xml->asXML(); + die; + } + + // Build xml document for all tree nodes + $xml = new SimpleXMLElement(''); + foreach ($menuCases as $menuId => $menuBlock) { + if (isset($menuBlock['blockItems']) && count($menuBlock['blockItems']) > 0) { + // adding "menu_block" node + $menuBlockNode = $xml->addChild('menu_block'); + $menuBlockNode->addAttribute('id', $menuId); + $menuBlockNode->addAttribute('blockTitle', $menuBlock['blockTitle']); + + if (! empty($menuBlock['link'])) { + $menuBlockNode->addAttribute('url', $menuBlock['link']); + } + + // adding "menu_block" childs nodes + foreach ($menuBlock['blockItems'] as $id => $menu) + { + $option = $menuBlockNode->addChild('option'); + $option->addAttribute('id', $id); + $option->addAttribute('title', $menu['label']); + $option->addAttribute('url', $menu['link']); + + if (! empty($menu['cases_count'])) { + $option->addAttribute('cases_count', $menu['cases_count']); + } + } + } elseif (isset($menuBlock['blockType']) && $menuBlock['blockType'] == "blockNestedTree") { + $menuBlockNode = $xml->addChild('menu_block'); + $menuBlockNode->addAttribute('id', $menuId); + $menuBlockNode->addAttribute('folderId', "0"); + $menuBlockNode->addAttribute('blockTitle', $menuBlock['blockTitle']); + $menuBlockNode->addAttribute('blockNestedTree', $menuBlock['loaderurl']); + } elseif (isset($menuBlock['blockType']) && $menuBlock['blockType'] == "blockHeaderNoChild") { + $menuBlockNode = $xml->addChild('menu_block'); + $menuBlockNode->addAttribute('id', $menuId); + $menuBlockNode->addAttribute('blockTitle', $menuBlock['blockTitle']); + $menuBlockNode->addAttribute('blockHeaderNoChild', "blockHeaderNoChild"); + $menuBlockNode->addAttribute('url', $menuBlock['link']); + } + } + + echo $xml->asXML(); + die; + + // Build xml document for all tree nodes + /*$xml = ''; $i = 0; foreach ($menuCases as $menu => $aMenuBlock) { if (isset( $aMenuBlock['blockItems'] ) && sizeof( $aMenuBlock['blockItems'] ) > 0) { @@ -100,7 +165,7 @@ function getLoadTreeMenuData () } $xml .= ''; - print $xml; + print $xml;*/ } // get the process summary of specific case list type, diff --git a/workflow/engine/templates/cases/main.js b/workflow/engine/templates/cases/main.js index 5ad3f6b51..6c02ea9d8 100755 --- a/workflow/engine/templates/cases/main.js +++ b/workflow/engine/templates/cases/main.js @@ -20,6 +20,8 @@ var NOTIFIER_FLAG = false; var result; var _action = ''; var _CASE_TITLE; +//@var treeMenuItemsLoaded -> added to flag the "treeMenuItems" tree, to ensure that its onload event is executed just once +var treeMenuItemsLoaded = false; Ext.onReady(function(){ new Ext.KeyMap(document, { @@ -228,25 +230,30 @@ Ext.onReady(function(){ }); var loader = treeMenuItems.getLoader(); - loader.on("load", function(){ - document.getElementById('casesSubFrame').src = defaultOption; + loader.on("load", function() { + // it was added since the feature to reload a specific node of tree is now working + if (! treeMenuItemsLoaded) { // this section of code should be executed once + document.getElementById('casesSubFrame').src = defaultOption; - // check if a case was open directly - if (defaultOption.indexOf('open') > -1) { - //if it is, then update cases tree - updateCasesTree(); - } + // check if a case was open directly + if (defaultOption.indexOf('open') > -1) { + //if it is, then update cases trees + updateCasesTree(); + } - if( _nodeId != '' ){ - treePanel1 = Ext.getCmp('tree-panel') - if(treePanel1) - node = treePanel1.getNodeById(_nodeId); - if(node) { - node.select(); - if (_nodeId == 'CASES_START_CASE') { - updateCasesTree(); + if( _nodeId != '' ){ + treePanel1 = Ext.getCmp('tree-panel') + if(treePanel1) + node = treePanel1.getNodeById(_nodeId); + if(node) { + node.select(); + if (_nodeId == 'CASES_START_CASE') { + updateCasesTree(); + } } } + + treeMenuItemsLoaded = true; } }); From e0da82b2e5fc9a091087bdcfab07a77136d01949 Mon Sep 17 00:00:00 2001 From: Luis Fernando Saisa Lopez Date: Fri, 26 Jul 2013 15:35:49 -0400 Subject: [PATCH 05/11] BUG 12439 "Actions by email: No manda la manda la notificacion" SOLVED - Actions by email: No manda la manda la notificacion - Problema resuelto, al configurar el Email de tipo "Mail PHP" y utilizando una activacion Actions by Email, la la notificacion se envia. * Available from version ProcessMaker-2.5.2-testing.1 --- workflow/engine/classes/class.wsBase.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/workflow/engine/classes/class.wsBase.php b/workflow/engine/classes/class.wsBase.php index 2829900a0..c0e54b00b 100755 --- a/workflow/engine/classes/class.wsBase.php +++ b/workflow/engine/classes/class.wsBase.php @@ -974,9 +974,14 @@ class wsBase $hasEmailFrom = preg_match( '/(.+)@(.+)\.(.+)/', $sFrom, $match ); - if (! $hasEmailFrom || strpos( $sFrom, $aSetup['MESS_ACCOUNT'] ) === false) { - $sFrom = '"' . stripslashes( $sFrom ) . '" <' . $aSetup['MESS_ACCOUNT'] . ">"; + if (!$hasEmailFrom || strpos($sFrom, $aSetup["MESS_ACCOUNT"]) === false) { + if (isset($aSetup["MESS_ACCOUNT"]) && $aSetup["MESS_ENGINE"] != "MAIL") { + $sFrom = "\"" . stripslashes($sFrom) . "\" <" . $aSetup["MESS_ACCOUNT"] . ">"; + } else { + $sFrom = ""; + } } + $showMessage = ($showMessage) ? 1 : 0 ; $messageArray = array( From d61a5d9374d40865c2ee37958d8f8e093c5e5157 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Mon, 29 Jul 2013 10:15:07 -0400 Subject: [PATCH 06/11] Missing select field "DOC_VERSION" in criteria object --- workflow/engine/classes/class.case.php | 1 + 1 file changed, 1 insertion(+) diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php index 036c204c3..54e8e51e1 100755 --- a/workflow/engine/classes/class.case.php +++ b/workflow/engine/classes/class.case.php @@ -5932,6 +5932,7 @@ class Cases $oCriteria->addSelectColumn(AppDocumentPeer::APP_DOC_TYPE); $oCriteria->addSelectColumn(AppDocumentPeer::APP_DOC_CREATE_DATE); $oCriteria->addSelectColumn(AppDocumentPeer::APP_DOC_INDEX); + $oCriteria->addSelectColumn(AppDocumentPeer::DOC_VERSION); $oCriteria->add(ApplicationPeer::PRO_UID, $PRO_UID); $oCriteria->addJoin(ApplicationPeer::APP_UID, AppDocumentPeer::APP_UID); From 825061f3f22ac58a5307a536736dd8049adfee63 Mon Sep 17 00:00:00 2001 From: Hector Cortez Date: Mon, 29 Jul 2013 10:53:42 -0400 Subject: [PATCH 07/11] BUG 12434 Habilitar PDF Compresing feature SOLVED - Habilitar PDF Compresing feature - Enabled compress mode for output documents to html2pdf and tcpdf. --- workflow/engine/classes/model/OutputDocument.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/workflow/engine/classes/model/OutputDocument.php b/workflow/engine/classes/model/OutputDocument.php index f96c7059a..e2061789b 100755 --- a/workflow/engine/classes/model/OutputDocument.php +++ b/workflow/engine/classes/model/OutputDocument.php @@ -672,6 +672,7 @@ class OutputDocument extends BaseOutputDocument $html2pdf->pdf->SetAuthor($aFields['USR_USERNAME']); $html2pdf->pdf->SetTitle('Processmaker'); $html2pdf->pdf->SetSubject($sFilename); + $html2pdf->pdf->SetCompression(true); //$html2pdf->pdf->SetKeywords('HTML2PDF, TCPDF, processmaker'); @@ -798,6 +799,7 @@ class OutputDocument extends BaseOutputDocument $pdf->SetAuthor($aFields['USR_USERNAME']); $pdf->SetTitle('Processmaker'); $pdf->SetSubject($sFilename); + $pdf->SetCompression(true); $margins = $aProperties['margins']; $margins["left"] = ($margins["left"] >= 0) ? $margins["left"] : PDF_MARGIN_LEFT; @@ -906,7 +908,7 @@ class OutputDocument extends BaseOutputDocument 'margins' => array('left' => 15, 'right' => 15, 'top' => 15, 'bottom' => 15,), 'encoding' => '', 'ps2pdf' => false, - 'compress' => false, + 'compress' => true, 'output' => 2, 'pdfversion' => '1.3', 'transparency_workaround' => false, From 611ed3447f7f1b109588ccf66a3937a728b00938 Mon Sep 17 00:00:00 2001 From: Luis Fernando Saisa Lopez Date: Mon, 29 Jul 2013 12:45:34 -0400 Subject: [PATCH 08/11] BUG 12439 "Actions by email: No manda la manda la notificacion" SOLVED - Actions by email: No manda la manda la notificacion - Problema resuelto, al configurar el Email de tipo "Mail PHP" y utilizando una activacion Actions by Email, la la notificacion se envia. * Available from version ProcessMaker-2.5.2-testing.1 --- workflow/engine/classes/class.wsBase.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow/engine/classes/class.wsBase.php b/workflow/engine/classes/class.wsBase.php index c0e54b00b..a0bdb95e1 100755 --- a/workflow/engine/classes/class.wsBase.php +++ b/workflow/engine/classes/class.wsBase.php @@ -975,10 +975,10 @@ class wsBase $hasEmailFrom = preg_match( '/(.+)@(.+)\.(.+)/', $sFrom, $match ); if (!$hasEmailFrom || strpos($sFrom, $aSetup["MESS_ACCOUNT"]) === false) { - if (isset($aSetup["MESS_ACCOUNT"]) && $aSetup["MESS_ENGINE"] != "MAIL") { + if (trim($aSetup["MESS_ACCOUNT"]) != "") { $sFrom = "\"" . stripslashes($sFrom) . "\" <" . $aSetup["MESS_ACCOUNT"] . ">"; } else { - $sFrom = ""; + $sFrom = ""; } } From b481d5ba3ec63cd7d13dfc4ebf6356e9bf44033b Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Date: Tue, 30 Jul 2013 10:39:35 -0400 Subject: [PATCH 09/11] BUG-12465 Se necesita una forma mas sencilla de rehabilitar el cron SOLVED - No se tenia una opcion para borrar el archivo que se crea con el cron. - se agrega un parametro "+reset", este parametro borra el archivo del cron y se puede continuar directamente con la ejecucion del cron. - php cron.php [+d"YYYY-MM-DD HH:MM:SS"] [+wWORKSPACE] [ACTIVITIES] [+reset] --- workflow/engine/bin/cron.php | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/workflow/engine/bin/cron.php b/workflow/engine/bin/cron.php index 9cac18b30..6bef76af8 100755 --- a/workflow/engine/bin/cron.php +++ b/workflow/engine/bin/cron.php @@ -3,7 +3,6 @@ * cron.php * @package workflow-engine-bin */ - ini_set('display_errors', 1); error_reporting(E_ALL); ini_set('memory_limit', '300M'); // nore: this may need to be higher for many projects @@ -58,15 +57,24 @@ $bCronIsRunning = false; $sLastExecution = null; $processcTimeProcess = 0; $processcTimeStart = 0; - if (file_exists(PATH_DATA . "cron")) { - $arrayCron = unserialize(trim(@file_get_contents(PATH_DATA . "cron"))); - $bCronIsRunning = (boolean)($arrayCron["bCronIsRunning"]); - $sLastExecution = $arrayCron["sLastExecution"]; - $processcTimeProcess = (isset($arrayCron["processcTimeProcess"]))? intval($arrayCron["processcTimeProcess"]) : 10; //Minutes - $processcTimeStart = (isset($arrayCron["processcTimeStart"]))? $arrayCron["processcTimeStart"] : 0; + $reset = false; + for ($i = 1; $i <= count($argv) - 1; $i++) { + if (strpos($argv[$i], "+reset") !== false) { + $reset = true; + break; + } + } + if (!$reset) { + $arrayCron = unserialize(trim(@file_get_contents(PATH_DATA . "cron"))); + $bCronIsRunning = (boolean)($arrayCron["bCronIsRunning"]); + $sLastExecution = $arrayCron["sLastExecution"]; + $processcTimeProcess = (isset($arrayCron["processcTimeProcess"]))? intval($arrayCron["processcTimeProcess"]) : 10; //Minutes + $processcTimeStart = (isset($arrayCron["processcTimeStart"]))? $arrayCron["processcTimeStart"] : 0; + } else { + G::rm_dir(PATH_DATA . "cron"); + } } - if ($bCronIsRunning && $processcTimeStart != 0) { if ((time() - $processcTimeStart) > ($processcTimeProcess * 60)) { //Cron finished his execution for some reason @@ -138,5 +146,6 @@ if (!$bCronIsRunning) { @file_put_contents(PATH_DATA . "cron", serialize($arrayCron)); } else { eprintln("The cron is running, please wait for it to finish.\nStarted in $sLastExecution"); + eprintln("If do you want force the execution use the command '+reset'" ,"green"); } From 9779b436a85288945aaa4142b6c1ce4c736b406b Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Date: Tue, 30 Jul 2013 11:45:16 -0400 Subject: [PATCH 10/11] BUG-12465 Se necesita una forma mas sencilla de rehabilitar el cron SOLVED - No se tenia una opcion para borrar el archivo que se crea con el cron. - se agrega un parametro "+force", este parametro borra el archivo del cron y se puede continuar directamente con la ejecuci - php cron.php [+d"YYYY-MM-DD HH:MM:SS"] [+wWORKSPACE] [ACTIVITIES] [+force] --- workflow/engine/bin/cron.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/workflow/engine/bin/cron.php b/workflow/engine/bin/cron.php index 6bef76af8..87edca6a0 100755 --- a/workflow/engine/bin/cron.php +++ b/workflow/engine/bin/cron.php @@ -58,14 +58,14 @@ $sLastExecution = null; $processcTimeProcess = 0; $processcTimeStart = 0; if (file_exists(PATH_DATA . "cron")) { - $reset = false; + $force = false; for ($i = 1; $i <= count($argv) - 1; $i++) { - if (strpos($argv[$i], "+reset") !== false) { - $reset = true; + if (strpos($argv[$i], "+force") !== false) { + $force = true; break; } } - if (!$reset) { + if (!$force) { $arrayCron = unserialize(trim(@file_get_contents(PATH_DATA . "cron"))); $bCronIsRunning = (boolean)($arrayCron["bCronIsRunning"]); $sLastExecution = $arrayCron["sLastExecution"]; @@ -146,6 +146,6 @@ if (!$bCronIsRunning) { @file_put_contents(PATH_DATA . "cron", serialize($arrayCron)); } else { eprintln("The cron is running, please wait for it to finish.\nStarted in $sLastExecution"); - eprintln("If do you want force the execution use the command '+reset'" ,"green"); + eprintln("If do you want force the execution use the option '+force', example: php -f +wworkflow +force" ,"green"); } From 7bbf22aa2caffb91bd5f3e9eefd7f069052f0e99 Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Date: Wed, 31 Jul 2013 10:30:07 -0400 Subject: [PATCH 11/11] BUG-12538 Report tables de admin->settings se cargan... SOLVED - No se diferenciaba desde que listado se llamaba a la creacion de un report table. - Se agrego una bandera flagProcessmaker que indica que se esta utilizando desde el processmap. --- workflow/engine/templates/pmTables/list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/templates/pmTables/list.js b/workflow/engine/templates/pmTables/list.js index 749a7dc9a..67e0be116 100755 --- a/workflow/engine/templates/pmTables/list.js +++ b/workflow/engine/templates/pmTables/list.js @@ -47,6 +47,7 @@ Ext.onReady(function(){ handler: newPMTable }); } + var flagProcessmap = (typeof('flagProcessmap') != 'undefined') ? flagProcessmap : 0; newMenuOptions.push({ text: _('ID_NEW_REPORT_TABLE'), @@ -414,7 +415,6 @@ DoNothing = function(){}; //Load New PM Table Forms NewReportTable = function() { - var flagProcessmap = (typeof('flagProcessmap') != 'undefined') ? flagProcessmap : 0; if(PRO_UID !== false) { location.href = 'pmTables/edit?PRO_UID='+PRO_UID+'&tableType=report&flagProcessmap='+flagProcessmap; } else {