From fd0ad58b527d7bfb5c6a3bb2ed2b4f644373c3c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Thu, 31 Jul 2014 18:11:04 +0200 Subject: [PATCH] Some notify policy api improvements --- taiga/projects/notifications/api.py | 2 +- taiga/projects/notifications/serializers.py | 7 ++++++- taiga/routers.py | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/taiga/projects/notifications/api.py b/taiga/projects/notifications/api.py index ec4d8dd5..b5f1b126 100644 --- a/taiga/projects/notifications/api.py +++ b/taiga/projects/notifications/api.py @@ -55,5 +55,5 @@ class NotifyPolicyViewSet(ModelCrudViewSet): qs = models.NotifyPolicy.objects.filter( Q(project__owner=self.request.user) | Q(project__memberships__user=self.request.user) - ) + ).order_by("project__name") return qs.distinct() diff --git a/taiga/projects/notifications/serializers.py b/taiga/projects/notifications/serializers.py index f95a9f28..f3316632 100644 --- a/taiga/projects/notifications/serializers.py +++ b/taiga/projects/notifications/serializers.py @@ -23,6 +23,11 @@ from . import models class NotifyPolicySerializer(serializers.ModelSerializer): + project_name = serializers.SerializerMethodField("get_project_name") + class Meta: model = models.NotifyPolicy - fields = ('id', 'project', 'notify_level') + fields = ('id', 'project', 'project_name', 'notify_level') + + def get_project_name(self, obj): + return obj.project.name diff --git a/taiga/routers.py b/taiga/routers.py index bb6f38d0..69161cc6 100644 --- a/taiga/routers.py +++ b/taiga/routers.py @@ -122,4 +122,4 @@ router.register(r"wiki-links", WikiLinkViewSet, base_name="wiki-links") # Notify policies from taiga.projects.notifications.api import NotifyPolicyViewSet -router.register(r"notifications", NotifyPolicyViewSet, base_name="notifications") +router.register(r"notify-policies", NotifyPolicyViewSet, base_name="notifications")