From 364d4a5d68066e9efca505a5a09ad298d095f20c Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 10 Dec 2015 13:11:21 +0100
Subject: [PATCH] ObjectController: allow API access

---
 .../Web/Controller/ObjectController.php         | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/library/Director/Web/Controller/ObjectController.php b/library/Director/Web/Controller/ObjectController.php
index 7e3a3e19..dfe8271f 100644
--- a/library/Director/Web/Controller/ObjectController.php
+++ b/library/Director/Web/Controller/ObjectController.php
@@ -9,8 +9,12 @@ abstract class ObjectController extends ActionController
 {
     protected $object;
 
+    protected $isApified = true;
+
     public function init()
     {
+        parent::init();
+
         $type = $this->getType();
 
         $params = array();
@@ -54,10 +58,10 @@ abstract class ObjectController extends ActionController
 
     public function indexAction()
     {
-        if ($this->wantsJson()) {
-            header('Content: application/json');
-            echo $this->object->toJson($this->params->shift('resolved'));
-            exit;
+        if ($this->getRequest()->isApiRequest()) {
+            return $this->sendJson(
+                $this->object->toPlainObject($this->params->shift('resolved'))
+            );
         }
 
         return $this->editAction();
@@ -217,9 +221,4 @@ abstract class ObjectController extends ActionController
 
         return $this->object;
     }
-
-    protected function wantsJson()
-    {
-        return $this->params->shift('json');
-    }
 }