diff options
Diffstat (limited to 'lib/models/resources/ResourceRequest.class.php')
| -rw-r--r-- | lib/models/resources/ResourceRequest.class.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/models/resources/ResourceRequest.class.php b/lib/models/resources/ResourceRequest.class.php index 277378a..5263011 100644 --- a/lib/models/resources/ResourceRequest.class.php +++ b/lib/models/resources/ResourceRequest.class.php @@ -858,7 +858,10 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen public function getEndDate() { $end_date = new DateTime(); - if (count($this->appointments) > 0) { + if ( + count($this->appointments) > 0 + && isset($this->appointments->last()->appointment->end_time) + ) { $end_date->setTimestamp($this->appointments->last()->appointment->end_time); return $end_date; } @@ -874,7 +877,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen return null; } - $end_date->setTimestamp($this->cycle->dates->last()->end_time); + $end_date->setTimestamp($date->end_time); return $end_date; } @@ -884,7 +887,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen return null; } - $end_date->setTimestamp($this->course->dates->last()->end_time); + $end_date->setTimestamp($date->end_time); return $end_date; } |