Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Expose license author field over the API

Roland Geider926a1565a1e5
diff --git a/wger/exercises/api/serializers.py b/wger/exercises/api/serializers.py
index 088e8218c..f675650af 100644
--- a/wger/exercises/api/serializers.py
+++ b/wger/exercises/api/serializers.py
@@ -52,6 +52,7 @@ class ExerciseBaseSerializer(serializers.ModelSerializer):
'muscles_secondary',
'equipment',
'variations',
+ 'license_author',
]
@@ -79,6 +80,9 @@ class ExerciseImageSerializer(serializers.ModelSerializer):
'image',
'is_main',
'style',
+ 'license',
+ 'license_author',
+ 'author_history'
]
@@ -105,6 +109,7 @@ class ExerciseVideoSerializer(serializers.ModelSerializer):
'codec_long',
'license',
'license_author',
+ 'author_history'
]
@@ -267,6 +272,7 @@ class ExerciseTranslationSerializer(serializers.ModelSerializer):
"description",
"creation_date",
"language",
+ 'license_author',
)
def validate(self, value):
diff --git a/wger/exercises/models/image.py b/wger/exercises/models/image.py
index 5ac52bedb..ed2d6a61f 100644
--- a/wger/exercises/models/image.py
+++ b/wger/exercises/models/image.py
@@ -27,7 +27,7 @@ from simple_history.models import HistoricalRecords
# wger
from wger.exercises.models import ExerciseBase
-from wger.utils.models import AbstractLicenseModel
+from wger.utils.models import AbstractLicenseModel, AbstractHistoryMixin
def exercise_image_upload_dir(instance, filename):
@@ -38,7 +38,7 @@ def exercise_image_upload_dir(instance, filename):
return f"exercise-images/{instance.exercise_base.id}/{instance.uuid}{ext}"
-class ExerciseImage(AbstractLicenseModel, models.Model):
+class ExerciseImage(AbstractLicenseModel, AbstractHistoryMixin, models.Model):
"""
Model for an exercise image
"""
diff --git a/wger/exercises/models/video.py b/wger/exercises/models/video.py
index d6bd97862..6aca806bb 100644
--- a/wger/exercises/models/video.py
+++ b/wger/exercises/models/video.py
@@ -35,8 +35,7 @@ except ImportError:
# wger
from wger.exercises.models import ExerciseBase
-from wger.utils.models import AbstractLicenseModel
-
+from wger.utils.models import AbstractLicenseModel, AbstractHistoryMixin
MAX_FILE_SIZE_MB = 100
@@ -75,7 +74,7 @@ def exercise_video_upload_dir(instance, filename):
return f"exercise-video/{instance.exercise_base.id}/{instance.uuid}{ext}"
-class ExerciseVideo(AbstractLicenseModel, models.Model):
+class ExerciseVideo(AbstractLicenseModel, AbstractHistoryMixin, models.Model):
"""
Model for an exercise image
"""
diff --git a/wger/utils/models.py b/wger/utils/models.py
index cbfa6d696..967518be3 100644
--- a/wger/utils/models.py
+++ b/wger/utils/models.py
@@ -89,7 +89,7 @@ class AbstractSubmissionModel(models.Model):
"""Status of the submission, e.g. accepted or declined"""
-class AbstractHistoryMixin():
+class AbstractHistoryMixin:
"""
Abstract class used to model specific historical records.