Merge branch 'master' of git://github.com/colosa/processmaker into BUG-0000
This commit is contained in:
@@ -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 );
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
</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">
|
||||
<en>Description</en>
|
||||
<en>Name</en>
|
||||
</SCH_NAME>
|
||||
|
||||
<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(){
|
||||
|
||||
getField("SCH_NAME").value = getField("SCH_NAME").value.trim();
|
||||
|
||||
var validFields = true;
|
||||
var requiredFields = '';
|
||||
var badFormatFields = '';
|
||||
|
||||
Reference in New Issue
Block a user