aboutsummaryrefslogtreecommitdiff
path: root/pyaggr3g470r/views/api/common.py
diff options
context:
space:
mode:
authorCédric Bonhomme <kimble.mandel+bitbucket@gmail.com>2015-08-06 23:36:13 +0200
committerCédric Bonhomme <kimble.mandel+bitbucket@gmail.com>2015-08-06 23:36:13 +0200
commit481d30d4b5d46608a7f0b5cf1122293bc61d3ea5 (patch)
tree4e8690425332988b84e62ebcd334f7bcb30bf89d /pyaggr3g470r/views/api/common.py
parentEnsuere that the arguments is an integer. (diff)
parentfixing bug preventing from bumping error count from api crawler for none admi... (diff)
downloadnewspipe-481d30d4b5d46608a7f0b5cf1122293bc61d3ea5.tar.gz
newspipe-481d30d4b5d46608a7f0b5cf1122293bc61d3ea5.tar.bz2
newspipe-481d30d4b5d46608a7f0b5cf1122293bc61d3ea5.zip
Merged in jaesivsm/pyaggr3g470r (pull request #21)
fixing bug on http crawler and light refact
Diffstat (limited to 'pyaggr3g470r/views/api/common.py')
-rw-r--r--pyaggr3g470r/views/api/common.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/pyaggr3g470r/views/api/common.py b/pyaggr3g470r/views/api/common.py
index a7068807..acb5dd68 100644
--- a/pyaggr3g470r/views/api/common.py
+++ b/pyaggr3g470r/views/api/common.py
@@ -161,17 +161,17 @@ class PyAggResourceMulti(PyAggAbstractResource):
"""retrieve several objects. filters can be set in the payload on the
different fields of the object, and a limit can be set in there as well
"""
- if 'application/json' not in request.headers.get('Content-Type'):
- raise BadRequest("Content-Type must be application/json")
- limit = 10
try:
limit = request.json.pop('limit', 10)
+ order_by = request.json.pop('order_by', None)
+ query = self.controller.read(**request.json)
except:
- return [res for res in self.controller.read().limit(limit)]
- if not limit:
- return [res for res in self.controller.read(**request.json).all()]
- return [res
- for res in self.controller.read(**request.json).limit(limit)]
+ limit, order_by, query = 10, None, self.controller.read()
+ if order_by:
+ query = query.order_by(order_by)
+ if limit:
+ query = query.limit(limit)
+ return [res for res in query]
def post(self):
"""creating several objects. payload should be a list of dict.
bgstack15