From 1c44ea0106ca0256e4cb692d3b0271ecc7790092 Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Sun, 19 Jun 2022 22:54:36 +0200
Subject: [PATCH] Fix view
---
aleksis/apps/paweljong/rules.py | 4 ++--
.../paweljong/event/{tos.html => terms.html} | 13 +++++++++++--
aleksis/apps/paweljong/urls.py | 2 +-
aleksis/apps/paweljong/views.py | 11 +++++------
4 files changed, 19 insertions(+), 11 deletions(-)
rename aleksis/apps/paweljong/templates/paweljong/event/{tos.html => terms.html} (54%)
diff --git a/aleksis/apps/paweljong/rules.py b/aleksis/apps/paweljong/rules.py
index fa4f9e5..5f0ee3b 100644
--- a/aleksis/apps/paweljong/rules.py
+++ b/aleksis/apps/paweljong/rules.py
@@ -232,5 +232,5 @@ rules.add_perm("paweljong.view_menu", can_view_menu_predicate)
can_retract_registration_predicate = has_person & (is_organiser)
rules.add_perm("paweljong.can_retract_registration_rule", can_retract_registration_predicate)
-can_view_tos_predicate = has_person & (is_participant)
-rules.add_perm("paweljong.can_view_tos_rule", can_view_tos_predicate)
+can_view_terms_predicate = has_person & (is_participant)
+rules.add_perm("paweljong.can_view_terms_rule", can_view_terms_predicate)
diff --git a/aleksis/apps/paweljong/templates/paweljong/event/tos.html b/aleksis/apps/paweljong/templates/paweljong/event/terms.html
similarity index 54%
rename from aleksis/apps/paweljong/templates/paweljong/event/tos.html
rename to aleksis/apps/paweljong/templates/paweljong/event/terms.html
index 9d63b8f..056eb17 100644
--- a/aleksis/apps/paweljong/templates/paweljong/event/tos.html
+++ b/aleksis/apps/paweljong/templates/paweljong/event/terms.html
@@ -6,8 +6,17 @@
{% block content %}
- {% for term in obj.terms.all %}
- {{ term }}
+ <div class="row">
+ {% for term in event.terms.all %}
+ <div class="col s12">
+ <div class="card">
+ <div class="card-content">
+ <span class="card-title">{{ term.title }}</span>
+ {{ term.term | safe}}
+ </div>
+ </div>
+ </div>
{% endfor %}
+ </div>
{% endblock %}
diff --git a/aleksis/apps/paweljong/urls.py b/aleksis/apps/paweljong/urls.py
index 6935ade..361c242 100644
--- a/aleksis/apps/paweljong/urls.py
+++ b/aleksis/apps/paweljong/urls.py
@@ -37,7 +37,7 @@ account_conditions = {
urlpatterns = [
path("event/<slug:slug>/edit", views.EditEventView.as_view(), name="edit_event_by_slug"),
- path("event/<slug:slug>/tos", views.ViewToS.as_view(), name="view_event_tos_by_slug"),
+ path("event/<slug:slug>/terms", views.ViewTerms.as_view(), name="view_event_terms_by_slug"),
path(
"event/<slug:slug>/register",
views.RegisterEventWizardView.as_view(register_forms, condition_dict=condition_dict),
diff --git a/aleksis/apps/paweljong/views.py b/aleksis/apps/paweljong/views.py
index 9c8ae24..c7b240f 100644
--- a/aleksis/apps/paweljong/views.py
+++ b/aleksis/apps/paweljong/views.py
@@ -953,12 +953,11 @@ class PersonGroupView(PermissionRequiredMixin, FormView):
def get_success_url(self):
return reverse("add_persons_to_group", kwargs={"pk": self.kwargs["pk"]})
-class ViewToS(PermissionRequiredMixin, FormView):
- template_name = "paweljong/event/tos.html"
- permission_required = "paweljong.can_view_tos_rule"
+class ViewTerms(PermissionRequiredMixin, DetailView):
+
+ context_object_name = "event"
+ template_name = "paweljong/event/terms.html"
+ permission_required = "paweljong.can_view_terms_rule"
model = Event
slug_field = "slug"
-
- def get_queryset(self):
- return Event.objects.all()
--
GitLab