wip

jaesivsm · Feb 20, 2016 · 6e97a3a · 6e97a3a
1 parent 324ee58
commit 6e97a3a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 13 deletions.
diff --git a/src/tests/api/article.py b/src/tests/api/article.py
@@ -23,6 +23,10 @@ def test_api_list(self):
         self.assertEquals(200, resp.status_code)
         self.assertEquals(1, len(resp.json))
 
+        resp = self._api('get', self.urns, user='admin')
+        self.assertEquals(200, resp.status_code)
+        self.assertEquals(10, len(resp.json))
+
         resp = self._api('get', self.urns, data={'limit': 200}, user='admin')
         self.assertEquals(200, resp.status_code)
         self.assertEquals(18, len(resp.json))

diff --git a/src/tests/api/category.py b/src/tests/api/category.py
@@ -17,6 +17,10 @@ def test_api_list(self):
         self.assertEquals(200, resp.status_code)
         self.assertEquals(1, len(resp.json))
 
+        resp = self._api('get', self.urns, user='admin')
+        self.assertEquals(200, resp.status_code)
+        self.assertEquals(4, len(resp.json))
+
         resp = self._api('get', self.urns, data={'limit': 200}, user='admin')
         self.assertEquals(200, resp.status_code)
         self.assertEquals(4, len(resp.json))

diff --git a/src/tests/api/feed.py b/src/tests/api/feed.py
@@ -22,6 +22,10 @@ def test_api_list(self):
         self.assertEquals(200, resp.status_code)
         self.assertEquals(1, len(resp.json))
 
+        resp = self._api('get', self.urns, user='admin')
+        self.assertEquals(200, resp.status_code)
+        self.assertEquals(6, len(resp.json))
+
         resp = self._api('get', self.urns, data={'limit': 200}, user='admin')
         self.assertEquals(200, resp.status_code)
         self.assertEquals(6, len(resp.json))

diff --git a/src/web/views/api/common.py b/src/web/views/api/common.py
@@ -108,11 +108,8 @@ def get(self, obj_id=None):
     def put(self, obj_id=None):
         """update an object, new attrs should be passed in the payload"""
         args = self.reqparse_args(right='write', default=False)
-        logger.debug(request.authorization)
         if not args:
             raise BadRequest()
-        if 'user_id' in args and not admin_permission.can():
-            raise BadRequest()
         return self.controller.update({'id': obj_id}, args), 200
 
     def delete(self, obj_id=None):
@@ -177,16 +174,13 @@ def put(self):
         class Proxy:
             pass
         for obj_id, attrs in request.json:
-            try:
-                Proxy.json = attrs
-                args = self.reqparse_args('write', req=Proxy, default=False)
-                result = self.controller.update({'id': obj_id}, args)
-                if result:
-                    results.append('ok')
-                else:
-                    results.append('nok')
-            except Exception as error:
-                results.append(str(error))
+            Proxy.json = attrs
+            args = self.reqparse_args('write', req=Proxy, default=False)
+            result = self.controller.update({'id': obj_id}, args)
+            if result:
+                results.append('ok')
+            else:
+                results.append('nok')
         if results.count('ok') == 0:  # all failed => 500
             status = 500
         elif results.count('ok') != len(results):  # some failed => 206