small adjustments

sourcefabric · Jan 8, 2015 · ace3002 · ace3002
1 parent aaa3d80
commit ace3002
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/features/0_api_articles.feature b/features/0_api_articles.feature
@@ -41,10 +41,10 @@ Feature: Endpoints
                 | onFrontPage      | 1                  ||
                 | onSection        | 1                  ||
                 | keywords         | test keywords      | 30 |
-                | fields[lead]     | <<sentence>>       | 15 |
-                | fields[content]  | <<sentence>>       | 35 |
+                | fields[content] | <<sentence>>       | 35 |
 
         When I submit "article" data to "<<new_article>>"
+            Then echo last response
             Then the response status code should be 200
             And the response is JSON
             And field "keywords" in the response should be "test keywords"
diff --git a/newscoop/src/Newscoop/GimmeBundle/Controller/ArticlesController.php b/newscoop/src/Newscoop/GimmeBundle/Controller/ArticlesController.php
@@ -120,9 +120,7 @@ public function createArticleAction(Request $request)
      *
      *  fields: array with article type fields and ther values.
      *
-     *     article[fields][Flead] = 'new lead'
-     *
-     *  field name is composed from "F"+"field_name": "Flead", "Fbody"
+     *     article[fields][lead] = 'new lead'
      *
      * @ApiDoc(
      *     statusCodes={
@@ -176,13 +174,7 @@ public function patchArticleAction(Request $request, $number, $language)
            // TODO add support for global for errors handler
         }
 
-        // Temporarily added to at least give some feedback,
-        // without it the status would always be 500
-        // @Author: Mischa
-        $response = new Response();
-        $response->setStatusCode(201);
-
-        return $response;
+        return new FOSView\View($form, 400);
     }
 
     private function postAddUpdate($article)

diff --git a/newscoop/src/Newscoop/GimmeBundle/EventListener/AllowOriginListener.php b/newscoop/src/Newscoop/GimmeBundle/EventListener/AllowOriginListener.php
@@ -37,7 +37,9 @@ public function onResponse(FilterResponseEvent $event)
         // HACK: revert exception status code to main request (i have no idea why it's chnaged to 500)
         if (is_array($content = json_decode($response->getContent(), true))) {
             if (array_key_exists('errors', $content)) {
-                $response->setStatusCode($content['errors'][0]['code'], $content['errors'][0]['message']);
+                if (isset($content['errors'][0]['code'])) {
+                    $response->setStatusCode($content['errors'][0]['code'], $content['errors'][0]['message']);
+                }
             }
         }