Merge branch 'release/1.3.2'

board/models.py

@@ -69,7 +69,7 @@ class Event(models.Model):
     employee = models.ForeignKey(Employee, on_delete=models.CASCADE, blank=True, null=True)
 
     def __str__(self):
-        return f"{self.description} on {self.date} @ {self.time}"
+        return f"{self.name} on {self.date} @ {self.time}"
 
     def get_absolute_url(self):
         return reverse('event-detail', kwargs={'pk': self.pk})

board/templates/board/event_form.html

@@ -6,6 +6,9 @@
     <section>
         <form method="POST" action="{% url 'event-update' event.pk %}">
             {% csrf_token %}
+            <p>
+                <a class="action-button action-button--danger" href="{% url 'event-delete' event.pk %}">Delete this event</a>
+            </p>
             {{form.as_p}}
             <p>
                 <input class="action-button" type="submit" value="Save changes"> or <a href="{% url 'profile-detail' %}">cancel</a>

board/templates/board/logentry_form.html

@@ -3,7 +3,7 @@
 {% block content %}
 <article>
     <header>
-    	<h1>Update Event</h1>
+    	<h1>Update LogEntry</h1>
     	<p><a class="action-button action-button--danger" href="{% url 'entry-delete' employee.pk logentry.pk %}">Delete this entry</a></p>	
     </header>
     <section>