From f6c0270d40f6730fe1e1820f2866b08792df1db6 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sat, 10 Dec 2016 18:22:34 +0100
Subject: rewrite data-model so that every configuration option is accessed
 through the conference

---
 view/schedule-json.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/schedule-json.php')

diff --git a/view/schedule-json.php b/view/schedule-json.php
index 9aea603..19346fd 100644
--- a/view/schedule-json.php
+++ b/view/schedule-json.php
@@ -1,6 +1,6 @@
 <?php
 
-$schedule = new Schedule();
+$schedule = $conference->getSchedule();
 if(!$schedule->isEnabled())
 	throw new NotFoundException('Schedule is disabled');
 
-- 
cgit v1.2.3


From 35e7a2b2adad42b077de60d1566c22da62edeb77 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sun, 18 Dec 2016 13:31:34 +0100
Subject: move upcoming & current logic from javascript/ajax into php

---
 view/schedule-json.php | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 view/schedule-json.php

(limited to 'view/schedule-json.php')

diff --git a/view/schedule-json.php b/view/schedule-json.php
deleted file mode 100644
index 19346fd..0000000
--- a/view/schedule-json.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-$schedule = $conference->getSchedule();
-if(!$schedule->isEnabled())
-	throw new NotFoundException('Schedule is disabled');
-
-header('Content-Type: application/json');
-
-if($conference->isClosed())
-	echo '{}';
-
-else
-	echo json_encode($schedule->getSchedule(), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
-- 
cgit v1.2.3