diff --git a/aleksis/apps/paweljong/rules.py b/aleksis/apps/paweljong/rules.py index fa4f9e55e310e2b329b4e8c449dc254ea39545a6..5f0ee3bfddf8898d8b52f5806a2df47d7dba49bd 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 9d63b8f417f2f45ffc252dd966e83671ee0b7925..056eb17bf704818a4b3dad9ac92812865df30215 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 6935adeca3e8e536242624166b857dd2673f1cf8..361c2424ea7fde61338543959d69b584e2c5e6ac 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 9c8ae2455bcda36b32b3bd6a9f4a52af44a6bea2..c7b240f5f485624bead3635b33517e9b4f7a0e78 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()