From 42e790d174e85e91910bb03577591b70ecaa9e1a Mon Sep 17 00:00:00 2001 From: Dustin Pianalto Date: Sat, 25 Apr 2020 20:40:26 -0800 Subject: [PATCH] Change requests detail to get not only open requests --- geeksbot_web/dmessages/models.py | 8 ++++++-- geeksbot_web/dmessages/views.py | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/geeksbot_web/dmessages/models.py b/geeksbot_web/dmessages/models.py index 1bf3c6c..76f8a17 100644 --- a/geeksbot_web/dmessages/models.py +++ b/geeksbot_web/dmessages/models.py @@ -235,9 +235,13 @@ class AdminRequest(models.Model): return cls.objects.filter(guild__id=guild_id).filter(completed=False) @classmethod - def get_open_request_by_id(cls, guild_id, request_id): + def get_requests_by_guild(cls, guild_id): + return cls.objects.filter(guild__id=guild_id) + + @classmethod + def get_request_by_id(cls, guild_id, request_id): try: - return cls.get_open_requests_by_guild(guild_id).get(id=request_id) + return cls.get_requests_by_guild(guild_id).get(id=request_id) except ObjectDoesNotExist: return None diff --git a/geeksbot_web/dmessages/views.py b/geeksbot_web/dmessages/views.py index 259f1e4..8d68864 100644 --- a/geeksbot_web/dmessages/views.py +++ b/geeksbot_web/dmessages/views.py @@ -120,7 +120,7 @@ class RequestDetailAPI(APIView): permission_classes = [IsAuthenticated] def get(self, req, guild_id, request_id, format=None): - req = AdminRequest.get_open_request_by_id(guild_id, request_id) + req = AdminRequest.get_request_by_id(guild_id, request_id) if req: comments = AdminComment.get_comments_by_request(req) if comments: