From 9b9f5b810d0cc4d46bfb09e94a2e99b4ee755768 Mon Sep 17 00:00:00 2001
From: Alvaro Campos <alvaro@colosa.com>
Date: Tue, 22 Feb 2011 16:05:57 +0000
Subject: [PATCH] Fixed problem default when editing a calendar

---
 workflow/engine/classes/model/CalendarDefinition.php |  5 ++---
 workflow/engine/xmlform/setup/calendarEdit.xml       | 11 +++++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/workflow/engine/classes/model/CalendarDefinition.php b/workflow/engine/classes/model/CalendarDefinition.php
index ab867f259..50d39be5d 100755
--- a/workflow/engine/classes/model/CalendarDefinition.php
+++ b/workflow/engine/classes/model/CalendarDefinition.php
@@ -100,9 +100,8 @@ class CalendarDefinition extends BaseCalendarDefinition {
 
     $CalendarHolidaysObj = new CalendarHolidays ( );
     $CalendarHolidays = $CalendarHolidaysObj->getCalendarHolidays ( $CalendarUid );
-    $fields ['HOLIDAY'] = $CalendarHolidays;
-    
-    $fields=$this->validateCalendarInfo($fields, $defaultCalendar);
+    $fields ['HOLIDAY'] = $CalendarHolidays;   
+   // $fields=$this->validateCalendarInfo($fields, $defaultCalendar); //********************
 
     return $fields;
 
diff --git a/workflow/engine/xmlform/setup/calendarEdit.xml b/workflow/engine/xmlform/setup/calendarEdit.xml
index 320052f89..6c424fe9d 100644
--- a/workflow/engine/xmlform/setup/calendarEdit.xml
+++ b/workflow/engine/xmlform/setup/calendarEdit.xml
@@ -81,6 +81,7 @@ if (getField('OLD_NAME').value==''){
   var rowsHoliday=Number_Rows_Grid("HOLIDAY", "CALENDAR_HOLIDAY_START");
 
   var j=0;
+  aux2=0;
     for(var j =1; j<= rowsHoliday;j++){
       var date1=getField('HOLIDAY]['+j+'][CALENDAR_HOLIDAY_START').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 aux=100;
      aux1 = validatedate(date1,date2,date11,date22,aux);
+    if (aux1=='1')
+    aux2=1;
     }
    
-    if(aux1=='-1')
-     validateForm(this.form);
-    else
+    if((aux1=='-1')&&(aux2=='0')){
+     validateForm(this.form);}
+    else{ 
       return false;
-
+}
 }
 
 function submit2 () {