fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/colosa/processmaker into BUG-0000

Browse Source
This commit is contained in:
Victor Saisa Lopez
2013-04-24 09:04:56 -04:00
parent 220c6491df 7d33d4ce06
commit b18bc6b7c0
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gulliver/system/class.g.php
View File

@@ -1395,24 +1395,22 @@ class G
if ($lang === '') { if ($lang === '') {
$lang = defined( SYS_LANG ) ? SYS_LANG : 'en'; $lang = defined( SYS_LANG ) ? SYS_LANG : 'en';
} }
$aux = explode( ' ', $date ); //para dividir la fecha del dia $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. $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. $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 $year = (int) ((isset( $date[0] )) ? $date[0] : '0'); //year
$month = (int) ((isset( $date[1] )) ? $date[1] : '0'); //month $month = (int) ((isset( $date[1] )) ? $date[1] : '0'); //month
$day = (int) ((isset( $date[2] )) ? $date[2] : '0'); //day $day = (int) ((isset( $date[2] )) ? $date[2] : '0'); //day
$h = isset( $time[0] ) ? $time[0] : '00'; //hour $h = isset( $time[0] ) ? $time[0] : '00'; //hour
$i = isset( $time[1] ) ? $time[1] : '00'; //minute $i = isset( $time[1] ) ? $time[1] : '00'; //minute
$s = isset( $time[2] ) ? $time[2] : '00'; //second $s = isset( $time[2] ) ? $time[2] : '00'; //second
$MONTHS = Array (); $MONTHS = Array ();
for ($i = 1; $i <= 12; $i ++) { for ($j = 1; $j <= 12; $j ++) {
$MONTHS[$i] = G::LoadTranslation( "ID_MONTH_$i", $lang ); $MONTHS[$j] = G::LoadTranslation( "ID_MONTH_$j", $lang );
} }
$d = (int) $day; $d = (int) $day;
@@ -1420,7 +1418,6 @@ class G
//missing D //missing D
$M = $MONTHS[$month]; $M = $MONTHS[$month];
$m = (int) $month; $m = (int) $month;
$mm = G::complete_field( $month, 2, 1 ); $mm = G::complete_field( $month, 2, 1 );

5
workflow/engine/xmlform/cases/cases_Scheduler_New.xml
View File

@@ -46,7 +46,7 @@
</TAS_UID> </TAS_UID>
<SCH_NAME type="text" maxlength="100" validate="Any" required="1" readonly="0" size="40" mode="edit" mask="" strto="" dependentfields="" defaultvalue="" hint="" formula="" function="" sqlconnection="" savelabel="0"> <SCH_NAME type="text" maxlength="100" validate="Any" required="1" readonly="0" size="40" mode="edit" mask="" strto="" dependentfields="" defaultvalue="" hint="" formula="" function="" sqlconnection="" savelabel="0">
<en>Description</en> <en>Name</en>
</SCH_NAME> </SCH_NAME>
<SCH_OPTION type="dropdown" required="1" readonly="0" savelabel="0" mode="edit" options="Array"> <SCH_OPTION type="dropdown" required="1" readonly="0" savelabel="0" mode="edit" options="Array">
@@ -623,6 +623,9 @@ function case_userSchedulerValidate(username, password) {
*/ */
function validateSchedulerFields(){ function validateSchedulerFields(){
getField("SCH_NAME").value = getField("SCH_NAME").value.trim();
var validFields = true; var validFields = true;
var requiredFields = ''; var requiredFields = '';
var badFormatFields = ''; var badFormatFields = '';