From 90dd1bb7fe8851bc817f73147b13f06ba91aafa5 Mon Sep 17 00:00:00 2001 From: Luis Fernando Saisa Lopez Date: Tue, 23 Apr 2013 17:18:39 +0000 Subject: [PATCH 1/2] BUG 11283 "Simplified Interface not reflecting minutes" SOLVED - Simplified Interface not reflecting minutese - Solved problem, the list of cases in the simplified interface, the minutes show correctly * Available from version ProcessMaker-2.0.47 (2.5.1) --- gulliver/system/class.g.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php index f98a1a59f..5fdde5e5c 100644 --- a/gulliver/system/class.g.php +++ b/gulliver/system/class.g.php @@ -1395,24 +1395,22 @@ class G if ($lang === '') { $lang = defined( SYS_LANG ) ? SYS_LANG : 'en'; } + $aux = explode( ' ', $date ); //para dividir la fecha del dia $date = explode( '-', isset( $aux[0] ) ? $aux[0] : '00-00-00' ); //para obtener los dias, el mes, y el año. $time = explode( ':', isset( $aux[1] ) ? $aux[1] : '00:00:00' ); //para obtener las horas, minutos, segundos. - $year = (int) ((isset( $date[0] )) ? $date[0] : '0'); //year $month = (int) ((isset( $date[1] )) ? $date[1] : '0'); //month $day = (int) ((isset( $date[2] )) ? $date[2] : '0'); //day - $h = isset( $time[0] ) ? $time[0] : '00'; //hour $i = isset( $time[1] ) ? $time[1] : '00'; //minute $s = isset( $time[2] ) ? $time[2] : '00'; //second - $MONTHS = Array (); - for ($i = 1; $i <= 12; $i ++) { - $MONTHS[$i] = G::LoadTranslation( "ID_MONTH_$i", $lang ); + for ($j = 1; $j <= 12; $j ++) { + $MONTHS[$j] = G::LoadTranslation( "ID_MONTH_$j", $lang ); } $d = (int) $day; @@ -1420,7 +1418,6 @@ class G //missing D - $M = $MONTHS[$month]; $m = (int) $month; $mm = G::complete_field( $month, 2, 1 ); From 4d7d129600904fc6d70a340e854ecfcdbe5f2773 Mon Sep 17 00:00:00 2001 From: jennylee Date: Tue, 23 Apr 2013 16:01:48 -0400 Subject: [PATCH 2/2] BUG-11275 Error creating Case Scheduler. SOLVED 1. The Label on the New Form Case Scheduler was changed into "Name", like in the List. 2. The Name field was validated to don't allow spaces " " like a valid name. --- workflow/engine/xmlform/cases/cases_Scheduler_New.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workflow/engine/xmlform/cases/cases_Scheduler_New.xml b/workflow/engine/xmlform/cases/cases_Scheduler_New.xml index 52570dd30..a8d6a5950 100755 --- a/workflow/engine/xmlform/cases/cases_Scheduler_New.xml +++ b/workflow/engine/xmlform/cases/cases_Scheduler_New.xml @@ -46,7 +46,7 @@ -Description +Name @@ -623,6 +623,9 @@ function case_userSchedulerValidate(username, password) { */ function validateSchedulerFields(){ + +getField("SCH_NAME").value = getField("SCH_NAME").value.trim(); + var validFields = true; var requiredFields = ''; var badFormatFields = '';