From a73b9f5600960ccd29991110bcb0c465251f7f24 Mon Sep 17 00:00:00 2001 From: j Date: Thu, 15 Feb 2018 15:57:03 +0100 Subject: [PATCH 1/2] use functools directly --- pandora/oxdjango/decorators.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pandora/oxdjango/decorators.py b/pandora/oxdjango/decorators.py index 55928fb4..1feeee67 100644 --- a/pandora/oxdjango/decorators.py +++ b/pandora/oxdjango/decorators.py @@ -2,10 +2,8 @@ # vi:si:et:sw=4:sts=4:ts=4 from __future__ import absolute_import -try: - from django.contrib.auth.decorators import wraps -except: - from django.utils.functional import wraps +from functools import wraps + from .shortcuts import render_to_json_response def login_required_json(function=None): From 1a3edf4f93e14a01fc6f77452e8f6b48ccd7e86f Mon Sep 17 00:00:00 2001 From: j Date: Thu, 15 Feb 2018 15:57:12 +0100 Subject: [PATCH 2/2] sort by document name --- pandora/entity/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora/entity/models.py b/pandora/entity/models.py index 2f70dea6..40a343ca 100644 --- a/pandora/entity/models.py +++ b/pandora/entity/models.py @@ -174,7 +174,7 @@ class Entity(models.Model): response[key] = self.name_sort elif key == 'documents': response[key] = [ox.toAZ(id_) - for id_, in self.documentproperties.order_by('index').values_list('document_id')] + for id_, in self.documentproperties.order_by('document__name_sort').values_list('document_id')] elif key in self.data: response[key] = self.data[key] return response