From ac70af458faa4663daefdfa87a2c941e896a63d2 Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Mon, 7 Oct 2013 10:26:21 -0400 Subject: [PATCH 1/3] Adicion para ordenamiento de la columna APP_STATUS en solr --- workflow/engine/classes/class.AppSolr.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/workflow/engine/classes/class.AppSolr.php b/workflow/engine/classes/class.AppSolr.php index abfd2a8f5..71ccc1f2f 100755 --- a/workflow/engine/classes/class.AppSolr.php +++ b/workflow/engine/classes/class.AppSolr.php @@ -351,6 +351,11 @@ class AppSolr //$sortableCols [0] = 'true'; $sortDir [0] = $dir; break; + case 'APP_STATUS' : + $sortCols [0] = 'APP_STATUS'; //6; + //$sortableCols [0] = 'true'; + $sortDir [0] = $dir; + break; case 'APP_UPDATE_DATE' : $sortCols [0] = 'DEL_LAST_UPDATE_DATE'; //12; //$sortableCols [0] = 'true'; From e44d59e5d50cbd5e4f09fbb27b37f815a78e5538 Mon Sep 17 00:00:00 2001 From: Roly Gutierrez Date: Tue, 8 Oct 2013 08:59:49 -0400 Subject: [PATCH 2/3] BUG-12991 VALIDATION PHP Notice: Undefined index in Array --- workflow/engine/classes/class.pmScript.php | 4 ++-- workflow/engine/methods/cases/cases_SaveData.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) mode change 100755 => 100644 workflow/engine/classes/class.pmScript.php mode change 100755 => 100644 workflow/engine/methods/cases/cases_SaveData.php diff --git a/workflow/engine/classes/class.pmScript.php b/workflow/engine/classes/class.pmScript.php old mode 100755 new mode 100644 index 7e2dc6a62..7cbd8f87b --- a/workflow/engine/classes/class.pmScript.php +++ b/workflow/engine/classes/class.pmScript.php @@ -575,7 +575,7 @@ function handleFatalErrors ($buffer) if (preg_match( '/(error<\/b>:)(.+)(/', '', $regs[2] ); $aAux = explode( ' in ', $err ); - $sCode = $_SESSION['_CODE_']; + $sCode = isset($_SESSION['_CODE_']) ? $_SESSION['_CODE_'] : null; unset( $_SESSION['_CODE_'] ); registerError( 2, $aAux[0], 0, $sCode ); if (strpos( $_SERVER['REQUEST_URI'], '/cases/cases_Step' ) !== false) { @@ -604,7 +604,7 @@ function handleFatalErrors ($buffer) die(); } else { $aNextStep = $oCase->getNextStep( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['STEP_POSITION'] ); - if ($_SESSION['TRIGGER_DEBUG']['ISSET']) { + if (isset($_SESSION['TRIGGER_DEBUG']['ISSET']) && $_SESSION['TRIGGER_DEBUG']['ISSET']) { $_SESSION['TRIGGER_DEBUG']['TIME'] = 'AFTER'; $_SESSION['TRIGGER_DEBUG']['BREAKPAGE'] = $aNextStep['PAGE']; $aNextStep['PAGE'] = $aNextStep['PAGE'] . '&breakpoint=triggerdebug'; diff --git a/workflow/engine/methods/cases/cases_SaveData.php b/workflow/engine/methods/cases/cases_SaveData.php old mode 100755 new mode 100644 index ac957d8e5..077b2dbde --- a/workflow/engine/methods/cases/cases_SaveData.php +++ b/workflow/engine/methods/cases/cases_SaveData.php @@ -56,7 +56,7 @@ try { $Fields["APP_DATA"] = array_merge( $Fields["APP_DATA"], $_POST["form"] ); #here we must verify if is a debug session - $trigger_debug_session = $_SESSION['TRIGGER_DEBUG']['ISSET']; #here we must verify if is a debugg session + $trigger_debug_session = isset($_SESSION['TRIGGER_DEBUG']['ISSET']) ? $_SESSION['TRIGGER_DEBUG']['ISSET'] : null; #here we must verify if is a debugg session #trigger debug routines... From 7f81269cbeba2d07782411ad092d98f95cac3a32 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Tue, 8 Oct 2013 12:11:39 -0400 Subject: [PATCH 3/3] BUG 11755 Interfaz de Ux Simple no esta traducida SOLVED - Aun existian un par de labels hardcoded (From, send at) - Se cambiaron todos los labels hardcoded --- .../skinEngine/simplified/templates/applications.html | 10 +++++----- workflow/engine/templates/home/appList.html | 2 +- workflow/engine/templates/home/applications.html | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/workflow/engine/skinEngine/simplified/templates/applications.html b/workflow/engine/skinEngine/simplified/templates/applications.html index 91cd8e0c3..14c665ace 100644 --- a/workflow/engine/skinEngine/simplified/templates/applications.html +++ b/workflow/engine/skinEngine/simplified/templates/applications.html @@ -3,15 +3,15 @@ #{$APP.APP_NUMBER} - + - + - +

{$APP.APP_TITLE} @@ -19,13 +19,13 @@

{if $APP.APP_DEL_PREVIOUS_USER != ''} - From {$APP.APP_DEL_PREVIOUS_USER}, send at + {translate label="ID_FROM"} {$APP.APP_DEL_PREVIOUS_USER}, {translate label="ID_SEND_AT"} {/if} {$APP.DEL_DELEGATE_DATE}

{$APP.APP_PRO_TITLE}
{$APP.APP_TAS_TITLE}

- +
{if $APP.NOTES_COUNT neq 0} {foreach from=$APP.NOTES_LIST key=k item=NOTE} diff --git a/workflow/engine/templates/home/appList.html b/workflow/engine/templates/home/appList.html index 0d3e77c0c..aa9807248 100644 --- a/workflow/engine/templates/home/appList.html +++ b/workflow/engine/templates/home/appList.html @@ -152,7 +152,7 @@ $('#loadmorebutton').html( {/literal}"{translate label="ID_LOAD_MORE"}"{literal} ); } else { - $('#loadmorebutton').replaceWith(
{/literal}"{translate label="ID_NO_MORE_APPLICATIONS"}"{literal}
); + $('#loadmorebutton').replaceWith({/literal}"{translate label="ID_NO_MORE_APPLICATIONS"}"{literal}); } } }); diff --git a/workflow/engine/templates/home/applications.html b/workflow/engine/templates/home/applications.html index 4f8368f49..821f3a428 100644 --- a/workflow/engine/templates/home/applications.html +++ b/workflow/engine/templates/home/applications.html @@ -19,7 +19,7 @@

{if $APP.APP_DEL_PREVIOUS_USER != ''} - From {$APP.APP_DEL_PREVIOUS_USER}, send at + {translate label="ID_FROM"} {$APP.APP_DEL_PREVIOUS_USER}, {translate label="ID_SEND_AT"} {/if} {$APP.DEL_DELEGATE_DATE}