repair schedule view

Fenrirthviti · Dec 11, 2016 · f499d4d · f499d4d
1 parent 0c3fca5
commit f499d4d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/model/Schedule.php b/model/Schedule.php
@@ -54,16 +54,9 @@ private function fetchSchedule()
 	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 @@ public function getSchedule()
 	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
@@ -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"