From 43ea1fbdd4af08daaeff3953858c1ea3258a2567 Mon Sep 17 00:00:00 2001 From: marcelo Date: Mon, 22 Apr 2013 11:42:31 -0400 Subject: [PATCH 01/12] BUG 11284 "When you select an image, the apply button image is shown on the right bottom side" SOLVED -When you select an image, the apply buttom image is not shown right on the right bottom side. -Solved, now the apply buttom image is not shown under the selected image. --- workflow/engine/templates/admin/pmLogo.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/workflow/engine/templates/admin/pmLogo.html b/workflow/engine/templates/admin/pmLogo.html index 94f930244..792e2694c 100644 --- a/workflow/engine/templates/admin/pmLogo.html +++ b/workflow/engine/templates/admin/pmLogo.html @@ -72,7 +72,7 @@ display : inline; margin : 4px; margin-right : 0; - padding : 5px; + padding : 22px; border : 1px solid white; } #images-view .thumb-wrap span { @@ -84,7 +84,7 @@ border : 1px solid #99bbe8; opacity : 0.5; background : #efefef url(/images/ext/row-over.gif) repeat-x left top; - padding : 5px; + padding : 22px; } @@ -92,7 +92,8 @@ border : 1px solid #99bbe8; background : #eff5fb url(/images/select-icon.png) no-repeat right bottom; opacity : 0.5; - padding : 5px; + padding : 22px; + text-align : center; } #images-view .x-view-selected .thumb { background : transparent; From 407aeab63ea79812be797b5255cf681baa053e9f Mon Sep 17 00:00:00 2001 From: Luis Fernando Saisa Lopez Date: Mon, 22 Apr 2013 16:28:42 +0000 Subject: [PATCH 02/12] BUG 11291 " No se deberia permitir la redimension de la..." SOLVED - No se deberia permitir la redimension de la ventana para pausar casos - Problema resuelto, no se permite dimensionar la ventana al pausar un caso * Available from version ProcessMaker-2.0.47 (2.5.1) --- workflow/engine/templates/cases/open.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/workflow/engine/templates/cases/open.js b/workflow/engine/templates/cases/open.js index 436a405ee..d73f5d5d4 100755 --- a/workflow/engine/templates/cases/open.js +++ b/workflow/engine/templates/cases/open.js @@ -121,7 +121,7 @@ Ext.onReady(function(){ var actionMenu = Ext.getCmp('actionMenu'); actionMenu.menu.removeAll(); for(j=0; j Date: Mon, 22 Apr 2013 13:31:19 -0400 Subject: [PATCH 03/12] BUG 9933 Step conditions evaluating too early IMPROVEMENT --- workflow/engine/classes/class.pmScript.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/workflow/engine/classes/class.pmScript.php b/workflow/engine/classes/class.pmScript.php index f55e7786a..0fc97a9cb 100755 --- a/workflow/engine/classes/class.pmScript.php +++ b/workflow/engine/classes/class.pmScript.php @@ -335,9 +335,12 @@ class PMScript for ($i = 0; $i < $iOcurrences; $i ++) { // if the variables for that condition has not been previously defined then $variableIsDefined // is set to false - if (! isset( $this->aFields[$aMatch[2][$i][0]] )) { - // $variableIsDefined = false; + if (!isset($this->aFields[$aMatch[2][$i][0]]) && !isset($aMatch[5][$i][0])) { $this->aFields[$aMatch[2][$i][0]] = ''; + } else { + if (!isset($this->aFields[$aMatch[2][$i][0]])) { + eval("\$this->aFields['" . $aMatch[2][$i][0] . "']" . $aMatch[5][$i][0] . " = '';"); + } } $sAux = substr( $this->sScript, $iAux, $aMatch[0][$i][1] - $iAux ); if (! $bEqual) { From 4ff5f7f78b95f43451862c231894996959c90643 Mon Sep 17 00:00:00 2001 From: marcelo Date: Mon, 22 Apr 2013 14:07:42 -0400 Subject: [PATCH 04/12] BUG 11284 "When you select an image, the apply button image is shown on the right bottom side" SOLVED -When you select an image, the apply buttom image is not shown right on the right bottom side. -Solved, now the apply buttom image is not shown under the selected image. --- workflow/engine/templates/admin/pmLogo.js | 1 + 1 file changed, 1 insertion(+) diff --git a/workflow/engine/templates/admin/pmLogo.js b/workflow/engine/templates/admin/pmLogo.js index 4f426d220..e63d0e35e 100644 --- a/workflow/engine/templates/admin/pmLogo.js +++ b/workflow/engine/templates/admin/pmLogo.js @@ -182,6 +182,7 @@ Ext.onReady(function() { autoHeight : false, height : 800, multiSelect : true, + autoScroll: true, overClass : 'x-view-over', itemSelector: 'div.thumb-wrap', emptyText : _('ID_NO_IMAGES_TO_DISPLAY'), From defaca05be154a78b0661d65ccd1649f3ddb825d Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Mon, 22 Apr 2013 15:04:13 -0400 Subject: [PATCH 05/12] DOCSYSTEM Arreglo para obtener la direccion de servidor Arreglo para obtener la direccion de servidor --- workflow/engine/classes/class.configuration.php | 2 +- workflow/engine/controllers/installer.php | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/workflow/engine/classes/class.configuration.php b/workflow/engine/classes/class.configuration.php index b3a7fa60b..e33b2599c 100755 --- a/workflow/engine/classes/class.configuration.php +++ b/workflow/engine/classes/class.configuration.php @@ -551,7 +551,7 @@ class Configurations // extends Configuration $langLocate = 'PTB'; break; case 'en': - case 'en_US': + case 'en-US': default: $langLocate = 'EST'; break; diff --git a/workflow/engine/controllers/installer.php b/workflow/engine/controllers/installer.php index 11edc3bc8..206e1e047 100644 --- a/workflow/engine/controllers/installer.php +++ b/workflow/engine/controllers/installer.php @@ -1335,8 +1335,14 @@ EOL; ini_set('max_execution_time', '0'); ini_set('memory_limit', '256M'); - $serv = 'http://'.$_SERVER['SERVER_NAME']; - + $serv = 'http://'; + if (isset($_SERVER['HTTPS']) && trim($_SERVER['HTTPS']) != '') { + $serv = 'https://'; + } + $serv .= $_SERVER['SERVER_NAME']; + if (isset($_SERVER['SERVER_PORT']) && trim($_SERVER['SERVER_PORT']) != '') { + $serv .= ':' . $_SERVER['SERVER_PORT']; + } // create session $cookiefile = sys_get_temp_dir() . PATH_SEP . 'curl-session'; From 0a0ac3303d6ca65097bd64d5d91dd66dd90ec3ca Mon Sep 17 00:00:00 2001 From: Victor Saisa Lopez Date: Mon, 22 Apr 2013 15:15:50 -0400 Subject: [PATCH 06/12] BUG 11216 "sql stripped from suggest field" SOLVED - Execution of query with clause DISTINCT, get duplicate data - Solved problem, added options for the clause SELECT * Available from version ProcessMaker-2.5 --- gulliver/methods/genericAjax.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gulliver/methods/genericAjax.php b/gulliver/methods/genericAjax.php index b84ea9004..3c3051f97 100755 --- a/gulliver/methods/genericAjax.php +++ b/gulliver/methods/genericAjax.php @@ -222,11 +222,11 @@ function sortByChar($aRows, $charSel) */ function queryModified($sqlParsed, $inputSel = "") { - if(!empty($sqlParsed['SELECT'])) { + $sqlSelectOptions = (isset($sqlParsed["OPTIONS"]) && count($sqlParsed["OPTIONS"]) > 0)? implode(" ", $sqlParsed["OPTIONS"]) : null; - $sqlSelect = "SELECT "; - $aSelect = $sqlParsed['SELECT']; + $sqlSelect = "SELECT $sqlSelectOptions "; + $aSelect = $sqlParsed["SELECT"]; $sFieldSel = (count($aSelect)>1 ) ? $aSelect[1]['base_expr'] : $aSelect[0]['base_expr']; foreach($aSelect as $key => $value ) { From 835608523fc4af7ba55623c2089f562badb45491 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Mon, 22 Apr 2013 16:53:46 -0400 Subject: [PATCH 07/12] Improvement in sysGeneric when try to load nonexistent files --- gulliver/templates/controller.exception.tpl | 5 +---- workflow/public_html/sysGeneric.php | 8 ++++++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gulliver/templates/controller.exception.tpl b/gulliver/templates/controller.exception.tpl index 204cf3544..3e77268e5 100755 --- a/gulliver/templates/controller.exception.tpl +++ b/gulliver/templates/controller.exception.tpl @@ -3,13 +3,11 @@ Server Error :: -