Merge pull request #6 from bignall/master

Add flash messages to the response
entomb · Dec 2, 2013 · 1a714c3 · 1a714c3
2 parents fafbf7f + 1fd5229
commit 1a714c3
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/jsonAPI/JsonApiView.php b/jsonAPI/JsonApiView.php
@@ -28,17 +28,27 @@ public function render($status=200) {
 
         $status = intval($status);
 
+        $response = $this->all();
+
         //append error bool
         if (!$this->has('error')) {
-            $this->set('error', false);
+            $response['error'] = false;
         }
 
         //append status code
-        $this->set('status', $status);
+        $response['status'] = $status;
+
+        //add flash messages
+        $flash = $this->data->flash->getMessages();
+        if (count($flash)) {
+            $response['flash'] = $flash;   
+        } else {
+            unset($response['flash']);
+        }
 
         $app->response()->status($status);
         $app->response()->header('Content-Type', 'application/json');
-        $app->response()->body(json_encode($this->all()));
+        $app->response()->body(json_encode($response));
 
         $app->stop();
     }