Merge branch 'master' into payment-choices

CHANGELOG.rst

@@ -6,6 +6,23 @@ All notable changes to this project will be documented in this file.
 The format is based on `Keep a Changelog`_,
 and this project adheres to `Semantic Versioning`_.
 
+`1.4.4`_
+--------
+
+Fixed
+~~~~~
+
+* Fixed URL to editPersonView
+
+`1.4.3`_
+--------
+
+Fixed
+-----
+
+* Show link to person edit view on registration detail page
+* Add get_person() method on EventRegistration model
+
 `1.4.2`_
 --------
 
@@ -120,3 +137,4 @@ Added
 .. _1.4: https://edugit.org/Teckids/hacknfun//AlekSIS-App-Paweljong/-/tags/1.4
 .. _1.4.1: https://edugit.org/Teckids/hacknfun//AlekSIS-App-Paweljong/-/tags/1.4.1
 .. _1.4.2: https://edugit.org/Teckids/hacknfun//AlekSIS-App-Paweljong/-/tags/1.4.2
+.. _1.4.3: https://edugit.org/Teckids/hacknfun//AlekSIS-App-Paweljong/-/tags/1.4.3

aleksis/apps/paweljong/models.py

@@ -271,6 +271,9 @@ class EventRegistration(ExtensibleModel):
         RegistrationState, verbose_name=_("States"), related_name="registrations"
     )
 
+    def get_person(self):
+        return self.person
+
     def get_invoice(self):
         # FIXME Maybe do not hard-code this
         client, __ = Client.objects.get_or_create(name="Teckids e.V.")

aleksis/apps/paweljong/templates/paweljong/event_registration/full.html

@@ -14,37 +14,46 @@
   {% has_perm 'paweljong.delete_registration' user registration as can_delete_registration %}
   {% has_perm 'paweljong.send_notification_mail' user registration as can_send_notification %}
   {% has_perm 'tezor.view_invoice_rule' user registration as can_view_invoice %}
+  {% has_perm 'core.edit_person_rule' user person as can_change_person %}
 
   {% if can_manage_registration or can_manage_registration_preferences or can_delete_registration or can_send_notification %}
     <p>
       {% if can_manage_registration %}
         <a href="{% url 'edit_registration_by_pk' registration.pk %}" class="btn waves-effect waves-light">
-          <i class="material-icons left">edit</i>
+          <i class="material-icons left iconify" data-icon="mdi:edit"></i>
           {% trans "Edit" %}
         </a>
       {% endif %}
 
       {% if can_delete_registration %}
         <a href="{% url 'delete_registration_by_pk' registration.pk %}" class="btn waves-effect waves-light red">
-          <i class="material-icons left">delete</i>
+          <i class="material-icons left iconify" data-icon="mdi:delete"></i>
           {% trans "Delete" %}
         </a>
       {% endif %}
 
       {% if can_send_notification %}
         <a href="{% url 'registration_notification_by_pk' registration.pk %}" class="btn waves-effect waves-light">
-          <i class="material-icons left">email</i>
+          <i class="material-icons left iconify" data-icon="mdi:email"></i>
           {% trans "Notification" %}
         </a>
       {% endif %}
 
       {% if can_view_invoice %}
         <a href="{% url 'invoice_by_token' registration.get_invoice.token %}" class="btn waves-effect waves-light">
-          <i class="material-icons left">attach_money</i>
+          <i class="material-icons left iconify" data-icon="mdi:cash"></i>
           {% trans "Invoice" %}
         </a>
       {% endif %}
 
+      {% if can_change_person %}
+        <a href="{% url 'edit_person_by_id' registration.person.id %}" class="btn waves-effect waves-light">
+          <i class="material-icons left iconify" data-icon="mdi:account-edit"></i>
+          {% trans "Edit person" %}
+        </a>
+      {% endif %}
+
+
     </p>
   {% endif %}
 

pyproject.toml

 [tool.poetry]
 name = "AlekSIS-App-Paweljong"
-version = "1.4.2"
+version = "1.4.4"
 packages = [
     { include = "aleksis" }
 ]