Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add django activity stream (WIP)
Roland Geiderefc6dc5355fe
diff --git a/requirements.txt b/requirements.txtindex ce5a7bd1f..e763b751d 100644--- a/requirements.txt+++ b/requirements.txt@@ -8,6 +8,7 @@ django-bootstrap-breadcrumbs~=0.9django-formtools~=2.3django-recaptcha~=3.0.0Django~=3.2+django-activity-stream~=1.4django-crispy-forms~=1.14django-simple-history~=3.0django-email-verification~=0.1.0diff --git a/wger/core/migrations/0014_merge_20210818_1735.py b/wger/core/migrations/0014_merge_20210818_1735.pyindex 7d7ef9af7..de7bc9114 100644--- a/wger/core/migrations/0014_merge_20210818_1735.py+++ b/wger/core/migrations/0014_merge_20210818_1735.py@@ -10,5 +10,4 @@ class Migration(migrations.Migration):('core', '0013_userprofile_email_verified'),]- operations = [- ]+ operations = []diff --git a/wger/exercises/api/serializers.py b/wger/exercises/api/serializers.pyindex 2745c8015..5e680ac02 100644--- a/wger/exercises/api/serializers.py+++ b/wger/exercises/api/serializers.py@@ -19,9 +19,9 @@ from rest_framework import serializers# wgerfrom wger.exercises.models import (+ Alias,Equipment,Exercise,- Alias,ExerciseBase,ExerciseCategory,ExerciseComment,diff --git a/wger/exercises/api/views.py b/wger/exercises/api/views.pyindex 37de9244f..ab9a2308f 100644--- a/wger/exercises/api/views.py+++ b/wger/exercises/api/views.py@@ -23,6 +23,7 @@ from django.db.models import Qfrom django.utils.translation import gettext as _# Third Party+from actstream import action as actstream_actionfrom easy_thumbnails.alias import aliasesfrom easy_thumbnails.files import get_thumbnailerfrom rest_framework import viewsets@@ -85,13 +86,28 @@ class ExerciseBaseViewSet(CreateUpdateModelViewSet):'equipment',)-class ExerciseViewSet(viewsets.ReadOnlyModelViewSet): #viewsets.ReadOnlyModelViewSet+ def perform_create(self, serializer):+ """+ Save entry to activity stream+ """+ super(ExerciseBaseViewSet, self).perform_create(serializer)+ actstream_action.send(self.request.user, verb='created', action_object=serializer.instance)++ def perform_update(self, serializer):+ """+ Save entry to activity stream+ """+ super(ExerciseBaseViewSet, self).perform_update(serializer)+ actstream_action.send(self.request.user, verb='updated', action_object=serializer.instance)+++class ExerciseViewSet(viewsets.ReadOnlyModelViewSet): #viewsets.ReadOnlyModelViewSet"""API endpoint for exercise objects. For a single read-only endpoint with allthe information of an exercise, see /api/v2/exerciseinfo/"""queryset = Exercise.objects.accepted()- permission_classes = (CanEditExercises,)+ permission_classes = (CanEditExercises, )serializer_class = ExerciseSerializerordering_fields = '__all__'filterset_fields = (diff --git a/wger/exercises/apps.py b/wger/exercises/apps.pyindex 7604dac84..d8360a235 100644--- a/wger/exercises/apps.py+++ b/wger/exercises/apps.py@@ -24,3 +24,7 @@ class ExerciseConfig(AppConfig):def ready(self):import wger.exercises.signals+ from actstream import registry+ registry.register(self.get_model('Exercise'))+ registry.register(self.get_model('ExerciseBase'))+ registry.register(self.get_model('ExerciseImage'))diff --git a/wger/exercises/management/commands/read-exercise-cleanup.py b/wger/exercises/management/commands/read-exercise-cleanup.pyindex 6dd99c437..9539d2647 100644--- a/wger/exercises/management/commands/read-exercise-cleanup.py+++ b/wger/exercises/management/commands/read-exercise-cleanup.py@@ -22,8 +22,10 @@ import pathlibfrom django.core.files import Filefrom django.core.management.base import BaseCommand-# wger+# Third Partyfrom utils.constants import DEFAULT_LICENSE_ID++# wgerfrom wger.core.models import (Language,License,diff --git a/wger/exercises/models/base.py b/wger/exercises/models/base.pyindex e2c08eafb..fe069e9f7 100644--- a/wger/exercises/models/base.py+++ b/wger/exercises/models/base.py@@ -92,10 +92,7 @@ class ExerciseBase(AbstractSubmissionModel, AbstractLicenseModel, models.Model):)"""The submission date"""- update_date = models.DateTimeField(- _('Date'),- auto_now=True- )+ update_date = models.DateTimeField(_('Date'), auto_now=True)"""Datetime of last modification"""history = HistoricalRecords()diff --git a/wger/exercises/models/exercise.py b/wger/exercises/models/exercise.pyindex b75878d58..f1aff0940 100644--- a/wger/exercises/models/exercise.py+++ b/wger/exercises/models/exercise.py@@ -32,6 +32,7 @@ from django.utils.translation import gettext_lazy as _# Third Partyimport bleach+from actstream import actionfrom simple_history.models import HistoricalRecords# wgerdiff --git a/wger/settings_global.py b/wger/settings_global.pyindex 2ea9ce9f4..7807bff21 100644--- a/wger/settings_global.py+++ b/wger/settings_global.py@@ -94,6 +94,9 @@ INSTALLED_APPS = (# Django email verification'django_email_verification',++ # Activity stream+ 'actstream')MIDDLEWARE = (@@ -459,3 +462,10 @@ EMAIL_MAIL_PLAIN = 'email_verification/email_body.txt'EMAIL_TOKEN_LIFE = 60 * 60EMAIL_PAGE_TEMPLATE = 'email_verification/confirm_template.html'EMAIL_PAGE_DOMAIN = 'https://wger.de/'++#+# Django activity stream+#+ACTSTREAM_SETTINGS = {+ 'USE_JSONFIELD': True,+}diff --git a/wger/urls.py b/wger/urls.pyindex 142806249..481036167 100644--- a/wger/urls.py+++ b/wger/urls.py@@ -96,7 +96,7 @@ router.register(router.register(r'exercisebaseinfo',exercises_api_views.ExerciseBaseInfoViewset,- basename='exercisebaseinfo'+ basename='exercisebaseinfo',)router.register(r'exercise',