From f09e2224b90eb44bdcf94e74157b78409919d4bd Mon Sep 17 00:00:00 2001 From: Bossanyi Tibor Date: Thu, 17 Jun 2021 23:31:47 +0200 Subject: [PATCH] BO 1.21 exercise_type buddy_warning --- .../aitrainer_backoffice/admin/exercise_type.py | 4 ++-- .../aitrainer_backoffice/models/exercise_type.py | 1 + aitrainer_backoffice/aitrainer_backoffice/settings/dev.py | 2 +- aitrainer_backoffice/aitrainer_backoffice/settings/prod.py | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/aitrainer_backoffice/aitrainer_backoffice/admin/exercise_type.py b/aitrainer_backoffice/aitrainer_backoffice/admin/exercise_type.py index 1b32de6..0120972 100644 --- a/aitrainer_backoffice/aitrainer_backoffice/admin/exercise_type.py +++ b/aitrainer_backoffice/aitrainer_backoffice/admin/exercise_type.py @@ -47,9 +47,9 @@ class ExerciseTypeParentsInline(admin.TabularInline): class ExerciseTypeAdmin(admin.ModelAdmin): - list_display = ('exercise_type_id', 'name_colored', 'active', 'base') + list_display = ('exercise_type_id', 'name_colored', 'active', 'base', 'buddy_warning') search_fields = ['name', 'exercisetypetranslation__name'] - fields = ('name', 'description', 'unit', 'unit_quantity', 'unit_quantity_unit', 'active', 'base') + fields = ('name', 'description', 'unit', 'unit_quantity', 'unit_quantity_unit', 'active', 'base', 'buddy_warning') def name_colored(self, obj): if obj.active: diff --git a/aitrainer_backoffice/aitrainer_backoffice/models/exercise_type.py b/aitrainer_backoffice/aitrainer_backoffice/models/exercise_type.py index 8070acf..5420c75 100644 --- a/aitrainer_backoffice/aitrainer_backoffice/models/exercise_type.py +++ b/aitrainer_backoffice/aitrainer_backoffice/models/exercise_type.py @@ -27,6 +27,7 @@ class ExerciseType(models.Model): null=True) active = models.BooleanField(default=0, blank=True, null=True) base = models.BooleanField(default=0, blank=True, null=True) + buddy_warning = models.BooleanField(default=False, ) parents = models.ManyToManyField(ExerciseTree, through='ExerciseTypeParents', related_name='ExerciseTree') class Meta: diff --git a/aitrainer_backoffice/aitrainer_backoffice/settings/dev.py b/aitrainer_backoffice/aitrainer_backoffice/settings/dev.py index 1df3482..47521f0 100644 --- a/aitrainer_backoffice/aitrainer_backoffice/settings/dev.py +++ b/aitrainer_backoffice/aitrainer_backoffice/settings/dev.py @@ -12,7 +12,7 @@ https://docs.djangoproject.com/en/3.0/ref/settings/ import os -BACKOFFICE_VERSION = 1.20 +BACKOFFICE_VERSION = 1.21 # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) diff --git a/aitrainer_backoffice/aitrainer_backoffice/settings/prod.py b/aitrainer_backoffice/aitrainer_backoffice/settings/prod.py index f1c8c79..09debd4 100644 --- a/aitrainer_backoffice/aitrainer_backoffice/settings/prod.py +++ b/aitrainer_backoffice/aitrainer_backoffice/settings/prod.py @@ -12,7 +12,7 @@ https://docs.djangoproject.com/en/3.0/ref/settings/ import os -BACKOFFICE_VERSION = 1.20 +BACKOFFICE_VERSION = 1.21 # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))