summaryrefslogtreecommitdiffstats
path: root/application/controllers/EventController.php
diff options
context:
space:
mode:
authorBjörn Geiger2011-11-17 13:06:39 +0100
committerBjörn Geiger2011-11-17 13:06:39 +0100
commit78d46b7c9caac5402330cb6957882a12ae8d62cb (patch)
treea69acae5285eb8493a7bdf0d9d5e0f5ace6003b3 /application/controllers/EventController.php
parentpbs2Api klasse korrigiert (diff)
parentnew js files (diff)
downloadpoolctrl-78d46b7c9caac5402330cb6957882a12ae8d62cb.tar.gz
poolctrl-78d46b7c9caac5402330cb6957882a12ae8d62cb.tar.xz
poolctrl-78d46b7c9caac5402330cb6957882a12ae8d62cb.zip
Diffstat (limited to 'application/controllers/EventController.php')
-rw-r--r--[-rwxr-xr-x]application/controllers/EventController.php11
1 files changed, 5 insertions, 6 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index bb48528..8cd21ea 100755..100644
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -1323,9 +1323,9 @@ class EventController extends Zend_Controller_Action
if($event->getPbs_poolID() == 2) {$textColor = 'black';}
else $textColor = 'white';
- $events[] = array(
-
- $events[] = array(
+ $events[] = array(
+
+ $events[] = array(
'id' => $event->getID(),
'title' => $event->getTitle(),
'start' => $event->getStart(),
@@ -1344,9 +1344,8 @@ class EventController extends Zend_Controller_Action
'opacity' => 1,
'immediate' => $event->getImmediate(),
'running' => $event->getRunning(),
- )
- );
- //}
+ )
+ );
}
echo json_encode($events);
}