From b064b8daa977f25bc95f5f111f43b17f41de473d Mon Sep 17 00:00:00 2001 From: Alvaro Campos Date: Fri, 2 Dec 2011 18:05:56 -0400 Subject: [PATCH] BUG 8050 the problem was solved calendar display --- workflow/engine/classes/model/CalendarDefinition.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/workflow/engine/classes/model/CalendarDefinition.php b/workflow/engine/classes/model/CalendarDefinition.php index 18efe229f..076393d07 100755 --- a/workflow/engine/classes/model/CalendarDefinition.php +++ b/workflow/engine/classes/model/CalendarDefinition.php @@ -346,7 +346,7 @@ class CalendarDefinition extends BaseCalendarDefinition { } - function getCalendarFor($userUid, $proUid, $tasUid) { + function getCalendarFor($userUid, $proUid, $tasUid, $sw_validate=true) { $Criteria = new Criteria ( 'workflow' ); //Default Calendar @@ -386,7 +386,11 @@ class CalendarDefinition extends BaseCalendarDefinition { } //print "

$calendarUid

"; + if($sw_validate){ $calendarDefinition = $this->getCalendarInfo ( $calendarUid ); + }else{ + $calendarDefinition = $this->getCalendarInfoE ( $calendarUid ); + } $calendarDefinition ['CALENDAR_APPLIED'] = $calendarOwner; $this->addCalendarLog ( "--=== Calendar Applied: " . $calendarDefinition ['CALENDAR_NAME'] . " -> $calendarOwner" ); return $calendarDefinition;