aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaZderMind2016-12-11 20:36:46 +0100
committerMaZderMind2016-12-11 20:36:46 +0100
commitf499d4d53a31011d523d8ebaf8c4f7f0fcea43b7 (patch)
tree09354c2c06eee6068162819bdd6520c081f59166
parent0c3fca54cfce9c595f713b0e0d62e1300ca05045 (diff)
repair schedule view
Diffstat (limited to '')
-rw-r--r--model/Schedule.php13
-rw-r--r--template/assemblies/schedule.phtml2
2 files changed, 4 insertions, 11 deletions
diff --git a/model/Schedule.php b/model/Schedule.php
index 0b789f2..eb9fe05 100644
--- a/model/Schedule.php
+++ b/model/Schedule.php
@@ -54,16 +54,9 @@ class Schedule
public function getSchedule()
{
// download schedule-xml
- try
- {
- $schedule = $this->fetchSchedule();
- }
- catch(Exception $e)
- {
- return array('_error' => (string)$e);
- }
+ $schedule = $this->fetchSchedule();
- $mapping = $this->getConference()->getScheduleToRoomSlugMapping();
+ $mapping = $this->getScheduleToRoomSlugMapping();
$program = array();
// re-calculate day-ends
@@ -257,7 +250,7 @@ class Schedule
public function getDurationSum()
{
$sum = 0;
- $schedule = $this->getConference()->getSchedule();
+ $schedule = $this->getSchedule();
foreach(reset($schedule) as $event)
$sum += $event['duration'];
diff --git a/template/assemblies/schedule.phtml b/template/assemblies/schedule.phtml
index b804196..90ec1b9 100644
--- a/template/assemblies/schedule.phtml
+++ b/template/assemblies/schedule.phtml
@@ -13,7 +13,7 @@
data-end="<?=intval($event['end'])?>"
>
<? $fromstart += $event['duration'] ?>
- <? $scheduleRoom = Room::createIfExists($roomname) ?>
+ <? $scheduleRoom = $conference->getRoomIfExists($roomname) ?>
<? if($scheduleRoom): ?>
<a
class="inner"