fernando/luos
1
0
Fork 0
Code Releases Activity

Fixed problem default when editing a calendar

Browse Source
This commit is contained in:
Alvaro Campos
2011-02-22 16:05:57 +00:00
parent eb8438154b
commit 9b9f5b810d
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
workflow/engine/classes/model/CalendarDefinition.php
View File

@@ -100,9 +100,8 @@ class CalendarDefinition extends BaseCalendarDefinition {
$CalendarHolidaysObj = new CalendarHolidays ( ); $CalendarHolidaysObj = new CalendarHolidays ( );
$CalendarHolidays = $CalendarHolidaysObj->getCalendarHolidays ( $CalendarUid ); $CalendarHolidays = $CalendarHolidaysObj->getCalendarHolidays ( $CalendarUid );
$fields ['HOLIDAY'] = $CalendarHolidays; $fields ['HOLIDAY'] = $CalendarHolidays;
// $fields=$this->validateCalendarInfo($fields, $defaultCalendar); //********************
$fields=$this->validateCalendarInfo($fields, $defaultCalendar);
return $fields; return $fields;

11
workflow/engine/xmlform/setup/calendarEdit.xml
View File

@@ -81,6 +81,7 @@ if (getField('OLD_NAME').value==''){
var rowsHoliday=Number_Rows_Grid("HOLIDAY", "CALENDAR_HOLIDAY_START"); var rowsHoliday=Number_Rows_Grid("HOLIDAY", "CALENDAR_HOLIDAY_START");
var j=0; var j=0;
aux2=0;
for(var j =1; j<= rowsHoliday;j++){ for(var j =1; j<= rowsHoliday;j++){
var date1=getField('HOLIDAY]['+j+'][CALENDAR_HOLIDAY_START').value; var date1=getField('HOLIDAY]['+j+'][CALENDAR_HOLIDAY_START').value;
var date2=getField('HOLIDAY]['+j+'][CALENDAR_HOLIDAY_END').value; var date2=getField('HOLIDAY]['+j+'][CALENDAR_HOLIDAY_END').value;
@@ -88,13 +89,15 @@ if (getField('OLD_NAME').value==''){
var date22=getField('HOLIDAY]['+j+'][CALENDAR_HOLIDAY_END'); var date22=getField('HOLIDAY]['+j+'][CALENDAR_HOLIDAY_END');
var aux=100; var aux=100;
aux1 = validatedate(date1,date2,date11,date22,aux); aux1 = validatedate(date1,date2,date11,date22,aux);
if (aux1=='1')
aux2=1;
} }
if(aux1=='-1') if((aux1=='-1')&&(aux2=='0')){
validateForm(this.form); validateForm(this.form);}
else else{
return false; return false;
}
} }
function submit2 () { function submit2 () {