Skip to content
Snippets Groups Projects
Verified Commit 671659a1 authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Use TimeStampedModel for Activity and Notification

parent fdc26ad0
No related branches found
No related tags found
1 merge request!385Resolve "Replace django-easy-audit"
...@@ -21,6 +21,7 @@ from django.utils.translation import gettext_lazy as _ ...@@ -21,6 +21,7 @@ from django.utils.translation import gettext_lazy as _
import jsonstore import jsonstore
from cache_memoize import cache_memoize from cache_memoize import cache_memoize
from dynamic_preferences.models import PerInstancePreferenceModel from dynamic_preferences.models import PerInstancePreferenceModel
from model_utils.models import TimeStampedModel
from phonenumber_field.modelfields import PhoneNumberField from phonenumber_field.modelfields import PhoneNumberField
from polymorphic.models import PolymorphicModel from polymorphic.models import PolymorphicModel
...@@ -440,7 +441,7 @@ class PersonGroupThrough(ExtensibleModel): ...@@ -440,7 +441,7 @@ class PersonGroupThrough(ExtensibleModel):
setattr(self, field_name, field_instance) setattr(self, field_name, field_instance)
class Activity(ExtensibleModel): class Activity(ExtensibleModel, TimeStampedModel):
"""Activity of a user to trace some actions done in AlekSIS in displayable form.""" """Activity of a user to trace some actions done in AlekSIS in displayable form."""
user = models.ForeignKey( user = models.ForeignKey(
...@@ -460,7 +461,7 @@ class Activity(ExtensibleModel): ...@@ -460,7 +461,7 @@ class Activity(ExtensibleModel):
verbose_name_plural = _("Activities") verbose_name_plural = _("Activities")
class Notification(ExtensibleModel): class Notification(ExtensibleModel, TimeStampedModel):
"""Notification to submit to a user.""" """Notification to submit to a user."""
sender = models.CharField(max_length=100, verbose_name=_("Sender")) sender = models.CharField(max_length=100, verbose_name=_("Sender"))
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<span class="badge new primary-color">{{ activity.app }}</span> <span class="badge new primary-color">{{ activity.app }}</span>
<span class="title">{{ activity.title }}</span> <span class="title">{{ activity.title }}</span>
<p> <p>
<i class="material-icons left">access_time</i> {{ activity.created_at }} <i class="material-icons left">access_time</i> {{ activity.created }}
</p> </p>
<p> <p>
{{ activity.description }} {{ activity.description }}
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
<span class="badge new primary-color">{{ notification.app }}</span> <span class="badge new primary-color">{{ notification.app }}</span>
<span class="title">{{ notification.title }}</span> <span class="title">{{ notification.title }}</span>
<p> <p>
<i class="material-icons left">access_time</i> {{ notification.created_at }} <i class="material-icons left">access_time</i> {{ notification.created }}
</p> </p>
<p> <p>
{{ notification.description }} {{ notification.description }}
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
{% trans "More information" %} → {{ notification.link }} {% trans "More information" %} → {{ notification.link }}
{% endif %} {% endif %}
{% blocktrans with trans_sender=notification.sender trans_created_at=notification.created_at %} {% blocktrans with trans_sender=notification.sender trans_created_at=notification.created %}
Sent by {{ trans_sender }} at {{ trans_created_at }} Sent by {{ trans_sender }} at {{ trans_created_at }}
{% endblocktrans %} {% endblocktrans %}
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
</blockquote> </blockquote>
<p> <p>
{% blocktrans with trans_sender=notification.sender trans_created_at=notification.created_at %} {% blocktrans with trans_sender=notification.sender trans_created_at=notification.created %}
Sent by {{ trans_sender }} at {{ trans_created_at }} Sent by {{ trans_sender }} at {{ trans_created_at }}
{% endblocktrans %} {% endblocktrans %}
</p> </p>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment