aboutsummaryrefslogtreecommitdiffstats
path: root/pydis_site
diff options
context:
space:
mode:
authorGravatar Sebastiaan Zeeff <[email protected]>2019-08-24 12:16:49 +0200
committerGravatar Sebastiaan Zeeff <[email protected]>2019-08-24 12:33:36 +0200
commitc22d092514a01964690d9e7d7888a08a40176d33 (patch)
tree97c4439203f5f507407dd96c3d5520bae5d8be90 /pydis_site
parentAdding staff app to .coveragerc and .dockerignore + updating app locations in... (diff)
Changing LogView to DetailView, as per Volcy's review
Diffstat (limited to 'pydis_site')
-rw-r--r--pydis_site/apps/staff/tests/test_logs_view.py2
-rw-r--r--pydis_site/apps/staff/viewsets/logs.py30
-rw-r--r--pydis_site/templates/staff/logs.html6
3 files changed, 8 insertions, 30 deletions
diff --git a/pydis_site/apps/staff/tests/test_logs_view.py b/pydis_site/apps/staff/tests/test_logs_view.py
index 4fc38c7a..ea6020e1 100644
--- a/pydis_site/apps/staff/tests/test_logs_view.py
+++ b/pydis_site/apps/staff/tests/test_logs_view.py
@@ -133,7 +133,7 @@ class TestLogsView(TestCase):
self.assertIn("messages", response.context)
self.assertListEqual(
[self.deleted_message_one, self.deleted_message_two],
- list(response.context["messages"])
+ list(response.context["deletion_context"].deletedmessage_set.all())
)
def test_if_both_embeds_are_included_html_response(self):
diff --git a/pydis_site/apps/staff/viewsets/logs.py b/pydis_site/apps/staff/viewsets/logs.py
index 0898d606..22dede95 100644
--- a/pydis_site/apps/staff/viewsets/logs.py
+++ b/pydis_site/apps/staff/viewsets/logs.py
@@ -1,33 +1,11 @@
-import logging
-
-from django.core.handlers.wsgi import WSGIRequest
-from django.http import HttpResponse
-from django.shortcuts import get_object_or_404, render
-from django.views import View
+from django.views.generic.detail import DetailView
from pydis_site.apps.api.models.bot.message_deletion_context import MessageDeletionContext
-log = logging.getLogger(__name__)
-
-class LogView(View):
+class LogView(DetailView):
"""The default view for the Deleted Messages logs."""
+ model = MessageDeletionContext
+ context_object_name = "deletion_context"
template_name = "staff/logs.html"
-
- def get(self, request: WSGIRequest, pk: int) -> HttpResponse:
- """Get method that answers a request with an html response by rendering a template."""
- message_context = get_object_or_404(MessageDeletionContext, pk=pk)
-
- actor = message_context.actor
- creation = message_context.creation
- messages = message_context.deletedmessage_set.all()
-
- template_fields = {
- 'actor': actor,
- 'actor_colour': message_context.actor.top_role.colour,
- 'creation': creation,
- 'messages': messages
- }
-
- return render(request, self.template_name, template_fields)
diff --git a/pydis_site/templates/staff/logs.html b/pydis_site/templates/staff/logs.html
index e5b3627d..9c8ed7d3 100644
--- a/pydis_site/templates/staff/logs.html
+++ b/pydis_site/templates/staff/logs.html
@@ -10,11 +10,11 @@
{% block content %}
<ul class="is-size-7">
- <li>Deleted by: <span style="color: {{ actor_colour | hex_colour }}">{{ actor }}</span></li>
- <li>Date: {{ creation }}</li>
+ <li>Deleted by: <span style="color: {{ deletion_context.actor.top_role.colour | hex_colour }}">{{ deletion_context.actor }}</span></li>
+ <li>Date: {{ deletion_context.creation }}</li>
</ul>
<div class="is-divider has-small-margin"></div>
- {% for message in messages %}
+ {% for message in deletion_context.deletedmessage_set.all %}
<div class="discord-message">
<div class="discord-message-header">
<span class="discord-username"