wayfinderak/geeksbot_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change requests detail to get not only open requests

Browse Source
This commit is contained in:
Dustin Pianalto 2020-04-25 20:40:26 -08:00
parent 7d8a7d02e5
commit 42e790d174
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
geeksbot_web/dmessages/models.py
View File

@ -235,9 +235,13 @@ class AdminRequest(models.Model):
return cls.objects.filter(guild__id=guild_id).filter(completed=False) return cls.objects.filter(guild__id=guild_id).filter(completed=False)
@classmethod @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: 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: except ObjectDoesNotExist:
return None return None

2
geeksbot_web/dmessages/views.py
View File

@ -120,7 +120,7 @@ class RequestDetailAPI(APIView):
permission_classes = [IsAuthenticated] permission_classes = [IsAuthenticated]
def get(self, req, guild_id, request_id, format=None): 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: if req:
comments = AdminComment.get_comments_by_request(req) comments = AdminComment.get_comments_by_request(req)
if comments: if comments: