Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add django-simple-history to keep a history of edits for exercise models

Roland Geider7055f4a29960
diff --git a/requirements.txt b/requirements.txt
index a08a21775..6a795419a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,6 +9,7 @@ django-formtools~=2.3
django-recaptcha~=2.0.6
Django~=3.2
django-crispy-forms~=1.11
+django-simple-history~=3.0
django_compressor~=2.4
django_extensions~=3.1
django-storages~=1.11
diff --git a/wger/exercises/api/views.py b/wger/exercises/api/views.py
index 2d88a028f..ea10d83f6 100644
--- a/wger/exercises/api/views.py
+++ b/wger/exercises/api/views.py
@@ -164,8 +164,8 @@ def search(request):
languages = load_item_languages(LanguageConfig.SHOW_ITEM_EXERCISES,
language_code=request.GET.get('language', None))
exercises = (Exercise.objects.filter(name__icontains=q)
+ .accepted()
.filter(language__in=languages)
- .filter(status=Exercise.STATUS_ACCEPTED)
.order_by('exercise_base__category__name', 'name')
.distinct())
diff --git a/wger/exercises/migrations/0014_historicalexercise_historicalexercisebase_historicalexercisecomment.py b/wger/exercises/migrations/0014_historicalexercise_historicalexercisebase_historicalexercisecomment.py
new file mode 100644
index 000000000..b2dccab0b
--- /dev/null
+++ b/wger/exercises/migrations/0014_historicalexercise_historicalexercisebase_historicalexercisecomment.py
@@ -0,0 +1,202 @@
+# Generated by Django 3.2.3 on 2021-05-30 14:24
+
+from django.conf import settings
+import django.core.validators
+from django.db import migrations, models
+import django.db.models.deletion
+import simple_history.models
+import uuid
+
+
+class Migration(migrations.Migration):
+ dependencies = [
+ ('core', '0012_auto_20210210_1228'),
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ('exercises', '0013_auto_20210503_1232'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='HistoricalExerciseComment',
+ fields=[
+ ('id', models.IntegerField(auto_created=True,
+ blank=True,
+ db_index=True,
+ verbose_name='ID')),
+ ('comment',
+ models.CharField(help_text='A comment about how to correctly do this exercise.',
+ max_length=200,
+ verbose_name='Comment')),
+ ('history_id', models.AutoField(primary_key=True,
+ serialize=False)),
+ ('history_date', models.DateTimeField()),
+ ('history_change_reason', models.CharField(max_length=100,
+ null=True)),
+ ('history_type',
+ models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')],
+ max_length=1)),
+ ('exercise',
+ models.ForeignKey(blank=True,
+ db_constraint=False,
+ editable=False,
+ null=True,
+ on_delete=django.db.models.deletion.DO_NOTHING,
+ related_name='+',
+ to='exercises.exercise',
+ verbose_name='Exercise')),
+ ('history_user',
+ models.ForeignKey(null=True,
+ on_delete=django.db.models.deletion.SET_NULL,
+ related_name='+',
+ to=settings.AUTH_USER_MODEL)),
+ ],
+ options={
+ 'verbose_name': 'historical exercise comment',
+ 'ordering': ('-history_date', '-history_id'),
+ 'get_latest_by': 'history_date',
+ },
+ bases=(simple_history.models.HistoricalChanges, models.Model),
+ ),
+ migrations.CreateModel(
+ name='HistoricalExerciseBase',
+ fields=[
+ ('id', models.IntegerField(auto_created=True,
+ blank=True,
+ db_index=True,
+ verbose_name='ID')),
+ ('license_author', models.CharField(blank=True,
+ help_text='If you are not the author, enter '
+ 'the name or source here. This is '
+ 'needed for some licenses e.g. the '
+ 'CC-BY-SA.',
+ max_length=50, null=True,
+ verbose_name='Author')),
+ ('status',
+ models.CharField(choices=[('1', 'Pending'), ('2', 'Accepted'), ('3', 'Declined')],
+ default='1',
+ editable=False,
+ max_length=2)),
+ ('uuid', models.UUIDField(default=uuid.uuid4,
+ editable=False,
+ verbose_name='UUID')),
+ ('history_id', models.AutoField(primary_key=True,
+ serialize=False)),
+ ('history_date', models.DateTimeField()),
+ ('history_change_reason', models.CharField(max_length=100, null=True)),
+ ('history_type',
+ models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')],
+ max_length=1)),
+ ('category', models.ForeignKey(blank=True,
+ db_constraint=False,
+ null=True,
+ on_delete=django.db.models.deletion.DO_NOTHING,
+ related_name='+', to='exercises.exercisecategory',
+ verbose_name='Category')),
+ ('history_user',
+ models.ForeignKey(null=True,
+ on_delete=django.db.models.deletion.SET_NULL,
+ related_name='+',
+ to=settings.AUTH_USER_MODEL)),
+ ('license', models.ForeignKey(blank=True,
+ db_constraint=False,
+ default=2,
+ null=True,
+ on_delete=django.db.models.deletion.DO_NOTHING,
+ related_name='+', to='core.license',
+ verbose_name='License')),
+ ('variations', models.ForeignKey(blank=True,
+ db_constraint=False,
+ null=True,
+ on_delete=django.db.models.deletion.DO_NOTHING,
+ related_name='+',
+ to='exercises.variation',
+ verbose_name='Variations')),
+ ],
+ options={
+ 'verbose_name': 'historical exercise base',
+ 'ordering': ('-history_date', '-history_id'),
+ 'get_latest_by': 'history_date',
+ },
+ bases=(simple_history.models.HistoricalChanges, models.Model),
+ ),
+ migrations.CreateModel(
+ name='HistoricalExercise',
+ fields=[
+ ('id', models.IntegerField(auto_created=True,
+ blank=True,
+ db_index=True,
+ verbose_name='ID')),
+ ('license_author',
+ models.CharField(blank=True,
+ help_text='If you are not the author, enter the name or source '
+ 'here. This is needed for some licenses e.g. the'
+ 'CC-BY-SA.',
+ max_length=50,
+ null=True,
+ verbose_name='Author')),
+ ('status',
+ models.CharField(choices=[('1', 'Pending'), ('2', 'Accepted'), ('3', 'Declined')],
+ default='1',
+ editable=False,
+ max_length=2)),
+ ('description',
+ models.TextField(max_length=2000,
+ validators=[django.core.validators.MinLengthValidator(40)],
+ verbose_name='Description')),
+ ('name', models.CharField(max_length=200,
+ verbose_name='Name')),
+ ('name_original',
+ models.CharField(default='',
+ max_length=200,
+ verbose_name='Name')),
+ ('creation_date',
+ models.DateField(blank=True,
+ editable=False,
+ null=True,
+ verbose_name='Date')),
+ ('uuid', models.UUIDField(default=uuid.uuid4,
+ editable=False,
+ verbose_name='UUID')),
+ ('history_id', models.AutoField(primary_key=True, serialize=False)),
+ ('history_date', models.DateTimeField()),
+ ('history_change_reason', models.CharField(max_length=100, null=True)),
+ ('history_type',
+ models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')],
+ max_length=1)),
+ ('exercise_base',
+ models.ForeignKey(blank=True,
+ db_constraint=False,
+ default=None,
+ null=True,
+ on_delete=django.db.models.deletion.DO_NOTHING,
+ related_name='+',
+ to='exercises.exercisebase',
+ verbose_name='ExerciseBase')),
+ ('history_user',
+ models.ForeignKey(null=True,
+ on_delete=django.db.models.deletion.SET_NULL,
+ related_name='+',
+ to=settings.AUTH_USER_MODEL)),
+ ('language', models.ForeignKey(blank=True,
+ db_constraint=False,
+ null=True,
+ on_delete=django.db.models.deletion.DO_NOTHING,
+ related_name='+',
+ to='core.language',
+ verbose_name='Language')),
+ ('license', models.ForeignKey(blank=True,
+ db_constraint=False,
+ default=2,
+ null=True,
+ on_delete=django.db.models.deletion.DO_NOTHING,
+ related_name='+', to='core.license',
+ verbose_name='License')),
+ ],
+ options={
+ 'verbose_name': 'historical exercise',
+ 'ordering': ('-history_date', '-history_id'),
+ 'get_latest_by': 'history_date',
+ },
+ bases=(simple_history.models.HistoricalChanges, models.Model),
+ ),
+ ]
diff --git a/wger/exercises/models.py b/wger/exercises/models.py
index c8b12d0a3..91538bba0 100644
--- a/wger/exercises/models.py
+++ b/wger/exercises/models.py
@@ -17,8 +17,8 @@
# Standard Library
import logging
-import uuid
import pathlib
+import uuid
# Django
from django.conf import settings
@@ -36,6 +36,7 @@ from django.utils.translation import gettext_lazy as _
# Third Party
import bleach
+from simple_history.models import HistoricalRecords
# wger
from wger.core.models import Language
@@ -221,6 +222,9 @@ class ExerciseBase(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
blank=True)
"""Variations of this exercise"""
+ history = HistoricalRecords()
+ """Edit history"""
+
#
# Own methods
#
@@ -277,6 +281,9 @@ class Exercise(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
related_name='exercises')
""" Refers to the base exercise with non translated information """
+ history = HistoricalRecords()
+ """Edit history"""
+
#
# Django methods
#
@@ -577,6 +584,9 @@ class ExerciseComment(models.Model):
verbose_name=_('Comment'),
help_text=_('A comment about how to correctly do this exercise.'))
+ history = HistoricalRecords()
+ """Edit history"""
+
def __str__(self):
"""
Return a more human-readable representation
diff --git a/wger/gallery/views/images.py b/wger/gallery/views/images.py
index 97d5f0580..8e2dfefaf 100644
--- a/wger/gallery/views/images.py
+++ b/wger/gallery/views/images.py
@@ -25,7 +25,7 @@ from django.urls import (
reverse,
reverse_lazy
)
-from django.utils.translation import gettext_lazy as _, gettext_lazy
+from django.utils.translation import gettext_lazy as _
from django.views.generic import (
CreateView,
DeleteView,
@@ -59,7 +59,7 @@ class ImageAddView(WgerFormMixin, CreateView):
"""
model = Image
form_class = ImageForm
- title = gettext_lazy('Add')
+ title = _('Add')
def get_initial(self):
"""
diff --git a/wger/settings_global.py b/wger/settings_global.py
index 9b1c952d2..8131970bb 100644
--- a/wger/settings_global.py
+++ b/wger/settings_global.py
@@ -87,6 +87,9 @@ INSTALLED_APPS = (
# CORS
'corsheaders',
+
+ # History keeping
+ 'simple_history',
)
@@ -111,6 +114,9 @@ MIDDLEWARE = (
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
'django.middleware.locale.LocaleMiddleware',
+
+ # History keeping
+ 'simple_history.middleware.HistoryRequestMiddleware',
)
AUTHENTICATION_BACKENDS = (