Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Update Django to 4.0

Roland Geidera808bf8a5c43
diff --git a/requirements.txt b/requirements.txt
index 59b70dcae..8737bf0a5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,10 +4,13 @@
# Application
bleach[css]~=5.0
-django-bootstrap-breadcrumbs~=0.9
+
+# this is a fork of django-bootstrap-breadcrumbs
+# we might need to think about migrating away from this completely
+django-bootstrap-breadcrumbs2==1.0.0
django-formtools~=2.4
django-recaptcha~=3.0.0
-Django~=3.2
+Django==4.0.8
django-activity-stream~=1.4
django-axes==5.40.1
django-crispy-forms~=1.14
diff --git a/wger/core/urls.py b/wger/core/urls.py
index c8b92712a..d96e4b270 100644
--- a/wger/core/urls.py
+++ b/wger/core/urls.py
@@ -15,12 +15,12 @@
# You should have received a copy of the GNU Affero General Public License
# Django
-from django.conf.urls import (
- include,
- url,
-)
+from django.conf.urls import include
from django.contrib.auth import views
-from django.urls import path
+from django.urls import (
+ path,
+ re_path,
+)
from django.views.generic import TemplateView
# wger
@@ -103,7 +103,7 @@ patterns_user = [
views.PasswordResetDoneView.as_view(),
name='password_reset_done',
),
- url(
+ re_path(
r'^password/reset/check/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',
user.WgerPasswordResetConfirmView.as_view(),
name='password_reset_confirm',
diff --git a/wger/core/views/languages.py b/wger/core/views/languages.py
index 55ce5d46b..28636df88 100644
--- a/wger/core/views/languages.py
+++ b/wger/core/views/languages.py
@@ -80,7 +80,6 @@ class LanguageDeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequired
"""
model = Language
- fields = ['short_name', 'full_name']
success_url = reverse_lazy('core:language:overview')
messages = gettext_lazy('Successfully deleted')
permission_required = 'core.delete_language'
diff --git a/wger/core/views/license.py b/wger/core/views/license.py
index 609b6ba8d..3dea79e1c 100644
--- a/wger/core/views/license.py
+++ b/wger/core/views/license.py
@@ -91,7 +91,6 @@ class LicenseDeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredM
"""
model = License
- fields = ['full_name', 'short_name', 'url']
success_url = reverse_lazy('core:license:list')
permission_required = 'core.delete_license'
diff --git a/wger/core/views/repetition_units.py b/wger/core/views/repetition_units.py
index 8b1048e84..03a532298 100644
--- a/wger/core/views/repetition_units.py
+++ b/wger/core/views/repetition_units.py
@@ -92,7 +92,6 @@ class DeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMixin, D
"""
model = RepetitionUnit
- fields = ['name']
success_url = reverse_lazy('core:repetition-unit:list')
permission_required = 'core.delete_repetitionunit'
diff --git a/wger/core/views/weight_units.py b/wger/core/views/weight_units.py
index a793c3b83..a3587f0ba 100644
--- a/wger/core/views/weight_units.py
+++ b/wger/core/views/weight_units.py
@@ -92,7 +92,6 @@ class DeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMixin, D
"""
model = WeightUnit
- fields = ['name']
success_url = reverse_lazy('core:weight-unit:list')
permission_required = 'core.delete_weightunit'
diff --git a/wger/exercises/urls.py b/wger/exercises/urls.py
index 0d1a3b12d..bacbc9514 100644
--- a/wger/exercises/urls.py
+++ b/wger/exercises/urls.py
@@ -16,11 +16,11 @@
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
# Django
-from django.conf.urls import (
- include,
- url,
+from django.conf.urls import include
+from django.urls import (
+ path,
+ re_path,
)
-from django.urls import path
from django.views.generic import TemplateView
# wger
@@ -147,7 +147,7 @@ patterns_exercise = [
exercises.view,
name='view',
),
- url(
+ re_path(
r'^(?P<id>\d+)/view/(?P<slug>[-\w]*)/?$',
exercises.view,
name='view',
diff --git a/wger/exercises/views/equipment.py b/wger/exercises/views/equipment.py
index 92708aa98..2448bef51 100644
--- a/wger/exercises/views/equipment.py
+++ b/wger/exercises/views/equipment.py
@@ -100,7 +100,6 @@ class EquipmentDeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequire
"""
model = Equipment
- fields = ('name', )
messages = gettext_lazy('Successfully deleted')
title = gettext_lazy('Delete equipment?')
permission_required = 'exercises.delete_equipment'
diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.py
index f31d99997..8be0a4821 100644
--- a/wger/exercises/views/exercises.py
+++ b/wger/exercises/views/exercises.py
@@ -179,7 +179,6 @@ class ExerciseDeleteView(
"""
model = Exercise
- fields = ('description', 'name')
success_url = reverse_lazy('exercise:exercise:overview')
delete_message_extra = gettext_lazy('This will delete the exercise from all workouts.')
messages = gettext_lazy('Successfully deleted')
diff --git a/wger/exercises/views/muscles.py b/wger/exercises/views/muscles.py
index 86ec7c728..644838980 100644
--- a/wger/exercises/views/muscles.py
+++ b/wger/exercises/views/muscles.py
@@ -93,7 +93,6 @@ class MuscleDeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMi
"""
model = Muscle
- fields = ('name', 'is_front', 'name_en')
success_url = reverse_lazy('exercise:muscle:admin-list')
permission_required = 'exercises.delete_muscle'
messages = gettext_lazy('Successfully deleted')
diff --git a/wger/gallery/views/images.py b/wger/gallery/views/images.py
index e4d63d464..03021d1a6 100644
--- a/wger/gallery/views/images.py
+++ b/wger/gallery/views/images.py
@@ -110,7 +110,6 @@ class ImageDeleteView(WgerDeleteMixin, LoginRequiredMixin, DeleteView):
"""
model = Image
- fields = ['image', 'date', 'description']
success_url = reverse_lazy('gallery:images:overview')
def get_context_data(self, **kwargs):
diff --git a/wger/gym/views/admin_notes.py b/wger/gym/views/admin_notes.py
index 1a1fefabf..0e9476294 100644
--- a/wger/gym/views/admin_notes.py
+++ b/wger/gym/views/admin_notes.py
@@ -167,7 +167,6 @@ class DeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMixin, D
"""
model = AdminUserNote
- fields = ('note', )
permission_required = 'gym.delete_adminusernote'
def get_success_url(self):
diff --git a/wger/gym/views/contract_option.py b/wger/gym/views/contract_option.py
index 53e76988a..1994d800e 100644
--- a/wger/gym/views/contract_option.py
+++ b/wger/gym/views/contract_option.py
@@ -130,7 +130,6 @@ class DeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMixin, D
"""
model = ContractOption
- fields = ('name', 'description')
permission_required = 'gym.delete_contractoption'
def dispatch(self, request, *args, **kwargs):
diff --git a/wger/gym/views/contract_type.py b/wger/gym/views/contract_type.py
index 242aefa92..d0e3c3645 100644
--- a/wger/gym/views/contract_type.py
+++ b/wger/gym/views/contract_type.py
@@ -130,7 +130,6 @@ class DeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMixin, D
"""
model = ContractType
- fields = ('name', 'description')
permission_required = 'gym.delete_contracttype'
def dispatch(self, request, *args, **kwargs):
diff --git a/wger/gym/views/document.py b/wger/gym/views/document.py
index 454f204f1..cf26c5e6c 100644
--- a/wger/gym/views/document.py
+++ b/wger/gym/views/document.py
@@ -177,7 +177,6 @@ class DeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMixin, D
"""
model = UserDocument
- fields = ('document', 'name', 'note')
permission_required = 'gym.delete_userdocument'
def get_success_url(self):
diff --git a/wger/gym/views/gym.py b/wger/gym/views/gym.py
index 7b19a069e..70b5893fe 100644
--- a/wger/gym/views/gym.py
+++ b/wger/gym/views/gym.py
@@ -466,15 +466,6 @@ class GymDeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMixin
"""
model = Gym
- fields = (
- 'name',
- 'phone',
- 'email',
- 'owner',
- 'zip_code',
- 'city',
- 'street',
- )
success_url = reverse_lazy('gym:gym:list')
permission_required = 'gym.delete_gym'
diff --git a/wger/manager/tests/test_workout_session.py b/wger/manager/tests/test_workout_session.py
index ca72c7579..6c14d3bb3 100644
--- a/wger/manager/tests/test_workout_session.py
+++ b/wger/manager/tests/test_workout_session.py
@@ -128,6 +128,7 @@ class WorkoutSessionDeleteLogsTestCase(WgerTestCase):
self.user_login('admin')
session = WorkoutSession.objects.get(pk=1)
+ self.assertEqual(WorkoutSession.objects.all().count(), 4)
count_before = WorkoutLog.objects.filter(
user__username=session.user.username,
date=session.date,
@@ -141,6 +142,8 @@ class WorkoutSessionDeleteLogsTestCase(WgerTestCase):
})
)
self.assertEqual(response.status_code, 302)
+ self.assertEqual(WorkoutSession.objects.all().count(), 3)
+
count_after = WorkoutLog.objects.filter(
user__username=session.user.username,
date=session.date,
diff --git a/wger/manager/urls.py b/wger/manager/urls.py
index a86811976..0c9aa8678 100644
--- a/wger/manager/urls.py
+++ b/wger/manager/urls.py
@@ -16,12 +16,12 @@
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
# Django
-from django.conf.urls import (
- include,
- url,
-)
+from django.conf.urls import include
from django.contrib.auth.decorators import login_required
-from django.urls import path
+from django.urls import (
+ path,
+ re_path,
+)
# wger
from wger.manager.views import (
@@ -117,7 +117,7 @@ patterns_workout = [
workout.view,
name='view',
),
- url(
+ re_path(
r'^calendar/(?P<username>[\w.@+-]+)$',
log.calendar,
name='calendar',
@@ -127,22 +127,22 @@ patterns_workout = [
log.calendar,
name='calendar',
),
- url(
+ re_path(
r'^calendar/(?P<username>[\w.@+-]+)/(?P<year>\d{4})/(?P<month>\d{1,2})$',
log.calendar,
name='calendar',
),
- url(
+ re_path(
r'^calendar/(?P<year>\d{4})/(?P<month>\d{1,2})$',
log.calendar,
name='calendar',
),
- url(
+ re_path(
r'^calendar/(?P<username>[\w.@+-]+)/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})$',
log.day,
name='calendar-day',
),
- url(
+ re_path(
r'^(?P<pk>\d+)/ical/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',
ical.export,
name='ical',
@@ -152,17 +152,17 @@ patterns_workout = [
ical.export,
name='ical',
),
- url(
+ re_path(
r'^(?P<id>\d+)/pdf/log/(?P<images>[01]+)/(?P<comments>[01]+)/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',
pdf.workout_log,
name='pdf-log',
), # JS!
- url(
+ re_path(
r'^(?P<id>\d+)/pdf/log/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',
pdf.workout_log,
name='pdf-log',
),
- url(
+ re_path(
r'^(?P<id>\d+)/pdf/log/(?P<images>[01]+)/(?P<comments>[01]+)$',
pdf.workout_log,
name='pdf-log',
@@ -172,17 +172,17 @@ patterns_workout = [
pdf.workout_log,
name='pdf-log',
),
- url(
+ re_path(
r'^(?P<id>\d+)/pdf/table/(?P<images>[01]+)/(?P<comments>[01]+)/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',
pdf.workout_view,
name='pdf-table',
), # JS!
- url(
+ re_path(
r'^(?P<id>\d+)/pdf/table/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',
pdf.workout_view,
name='pdf-table',
),
- url(
+ re_path(
r'^(?P<id>\d+)/pdf/table/(?P<images>[01]+)/(?P<comments>[01]+)$',
pdf.workout_view,
name='pdf-table',
@@ -196,7 +196,7 @@ patterns_workout = [
# sub patterns for workout sessions
patterns_session = [
- url(
+ re_path(
r'^(?P<workout_pk>\d+)/add/(?P<year>\d{4})-(?P<month>\d{1,2})-(?P<day>\d{1,2})$',
workout_session.WorkoutSessionAddView.as_view(),
name='add',
@@ -206,7 +206,7 @@ patterns_session = [
workout_session.WorkoutSessionUpdateView.as_view(),
name='edit',
),
- url(
+ re_path(
r'^(?P<pk>\d+)/delete/(?P<logs>session|logs)?$',
workout_session.WorkoutSessionDeleteView.as_view(),
name='delete',
@@ -298,7 +298,7 @@ patterns_schedule = [
schedule.ScheduleDeleteView.as_view(),
name='delete',
),
- url(
+ re_path(
r'^(?P<pk>\d+)/ical/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',
ical.export_schedule,
name='ical',
@@ -308,17 +308,17 @@ patterns_schedule = [
ical.export_schedule,
name='ical',
),
- url(
+ re_path(
r'^(?P<pk>\d+)/pdf/log/(?P<images>[01]+)/(?P<comments>[01]+)/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',
schedule.export_pdf_log,
name='pdf-log',
), # JS!
- url(
+ re_path(
r'^(?P<pk>\d+)/pdf/log/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',
schedule.export_pdf_log,
name='pdf-log',
),
- url(
+ re_path(
r'^(?P<pk>\d+)/pdf/log/(?P<images>[01]+)/(?P<comments>[01]+)$',
schedule.export_pdf_log,
name='pdf-log',
@@ -328,17 +328,17 @@ patterns_schedule = [
schedule.export_pdf_log,
name='pdf-log',
),
- url(
+ re_path(
r'^(?P<pk>\d+)/pdf/table/(?P<images>[01]+)/(?P<comments>[01]+)/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',
schedule.export_pdf_table,
name='pdf-table',
), # JS!
- url(
+ re_path(
r'^(?P<pk>\d+)/pdf/table/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',
schedule.export_pdf_table,
name='pdf-table',
),
- url(
+ re_path(
r'^(?P<pk>\d+)/pdf/table/(?P<images>[01]+)/(?P<comments>[01]+)$',
schedule.export_pdf_table,
name='pdf-table',
diff --git a/wger/manager/views/log.py b/wger/manager/views/log.py
index 745b69057..3bafec54b 100644
--- a/wger/manager/views/log.py
+++ b/wger/manager/views/log.py
@@ -99,14 +99,6 @@ class WorkoutLogDeleteView(WgerDeleteMixin, DeleteView, LoginRequiredMixin):
"""
model = WorkoutLog
- fields = (
- 'exercise_base',
- 'workout',
- 'repetition_unit',
- 'reps',
- 'weight',
- 'weight_unit',
- )
success_url = reverse_lazy('manager:workout:calendar')
title = gettext_lazy('Delete workout log')
diff --git a/wger/manager/views/schedule.py b/wger/manager/views/schedule.py
index 6a39e512c..759e4a65e 100644
--- a/wger/manager/views/schedule.py
+++ b/wger/manager/views/schedule.py
@@ -306,7 +306,6 @@ class ScheduleDeleteView(WgerDeleteMixin, DeleteView, PermissionRequiredMixin):
"""
model = Schedule
- fields = ('name', 'start_date', 'is_active', 'is_loop')
success_url = reverse_lazy('manager:schedule:overview')
messages = gettext_lazy('Successfully deleted')
diff --git a/wger/manager/views/schedule_step.py b/wger/manager/views/schedule_step.py
index e97b33dc5..eb5be6e3f 100644
--- a/wger/manager/views/schedule_step.py
+++ b/wger/manager/views/schedule_step.py
@@ -125,7 +125,6 @@ class StepDeleteView(WgerDeleteMixin, DeleteView, PermissionRequiredMixin):
"""
model = ScheduleStep
- fields = ('workout', 'duration', 'order')
messages = gettext_lazy('Successfully deleted')
def get_success_url(self):
diff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.py
index d69492463..af10fd60b 100644
--- a/wger/manager/views/workout.py
+++ b/wger/manager/views/workout.py
@@ -264,7 +264,6 @@ class WorkoutDeleteView(WgerDeleteMixin, LoginRequiredMixin, DeleteView):
"""
model = Workout
- fields = ('name', )
success_url = reverse_lazy('manager:workout:overview')
messages = gettext_lazy('Successfully deleted')
diff --git a/wger/manager/views/workout_session.py b/wger/manager/views/workout_session.py
index a3ac64973..63c9147f0 100644
--- a/wger/manager/views/workout_session.py
+++ b/wger/manager/views/workout_session.py
@@ -136,18 +136,17 @@ class WorkoutSessionDeleteView(WgerDeleteMixin, LoginRequiredMixin, DeleteView):
"""
model = WorkoutSession
- fields = ('date', 'notes', 'impression', 'time_start', 'time_end')
success_url = reverse_lazy('manager:workout:overview')
messages = gettext_lazy('Successfully deleted')
- def delete(self, request, *args, **kwargs):
+ def form_valid(self, form):
"""
Delete the workout session and, if wished, all associated weight logs as well
"""
if self.kwargs.get('logs') == 'logs':
WorkoutLog.objects.filter(user=self.request.user, date=self.get_object().date).delete()
- return super(WorkoutSessionDeleteView, self).delete(request, *args, **kwargs)
+ return super().form_valid(form)
def get_context_data(self, **kwargs):
diff --git a/wger/nutrition/urls.py b/wger/nutrition/urls.py
index 299f069e7..bf5078d67 100644
--- a/wger/nutrition/urls.py
+++ b/wger/nutrition/urls.py
@@ -16,12 +16,12 @@
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
# Django
-from django.conf.urls import (
- include,
- url,
-)
+from django.conf.urls import include
from django.contrib.auth.decorators import login_required
-from django.urls import path
+from django.urls import (
+ path,
+ re_path,
+)
# wger
from wger.nutrition.views import (
@@ -69,7 +69,7 @@ patterns_plan = [
login_required(plan.PlanEditView.as_view()),
name='edit',
),
- url(
+ re_path(
r'^(?P<id>\d+)/pdf/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})',
plan.export_pdf,
name='export-pdf',
@@ -256,7 +256,7 @@ patterns_diary = [
log.overview,
name='overview',
),
- url(
+ re_path(
r'^(?P<pk>\d+)/(?P<year>\d{4})-(?P<month>\d{1,2})-(?P<day>\d{1,2})$',
log.detail,
name='detail',
diff --git a/wger/nutrition/views/ingredient.py b/wger/nutrition/views/ingredient.py
index 938cf148b..c3e514de2 100644
--- a/wger/nutrition/views/ingredient.py
+++ b/wger/nutrition/views/ingredient.py
@@ -122,17 +122,6 @@ class IngredientDeleteView(
"""
model = Ingredient
- fields = (
- 'name',
- 'energy',
- 'protein',
- 'carbohydrates',
- 'carbohydrates_sugar',
- 'fat',
- 'fat_saturated',
- 'fibres',
- 'sodium',
- )
template_name = 'delete.html'
success_url = reverse_lazy('nutrition:ingredient:list')
messages = gettext_lazy('Successfully deleted')
diff --git a/wger/nutrition/views/log.py b/wger/nutrition/views/log.py
index a4180e752..96a16644d 100644
--- a/wger/nutrition/views/log.py
+++ b/wger/nutrition/views/log.py
@@ -230,9 +230,6 @@ class LogDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
title = gettext_lazy('Delete?')
form_action_urlname = 'nutrition:log:delete'
login_required = True
- fields = [
- "comment",
- ]
def get_success_url(self):
"""
diff --git a/wger/nutrition/views/plan.py b/wger/nutrition/views/plan.py
index 10a09b486..cae8300ca 100644
--- a/wger/nutrition/views/plan.py
+++ b/wger/nutrition/views/plan.py
@@ -115,7 +115,6 @@ class PlanDeleteView(WgerDeleteMixin, DeleteView):
"""
model = NutritionPlan
- fields = ('description', 'has_goal_calories')
success_url = reverse_lazy('nutrition:plan:overview')
messages = gettext_lazy('Successfully deleted')
diff --git a/wger/nutrition/views/unit.py b/wger/nutrition/views/unit.py
index 395825b63..7f97a0910 100644
--- a/wger/nutrition/views/unit.py
+++ b/wger/nutrition/views/unit.py
@@ -105,7 +105,6 @@ class WeightUnitDeleteView(
"""
model = WeightUnit
- fields = ['name']
success_url = reverse_lazy('nutrition:weight_unit:list')
permission_required = 'nutrition.delete_ingredientweightunit'
messages = gettext_lazy('Successfully deleted')
diff --git a/wger/nutrition/views/unit_ingredient.py b/wger/nutrition/views/unit_ingredient.py
index 852ee4f1a..422ccbcf1 100644
--- a/wger/nutrition/views/unit_ingredient.py
+++ b/wger/nutrition/views/unit_ingredient.py
@@ -135,7 +135,6 @@ class WeightUnitIngredientDeleteView(
"""
model = IngredientWeightUnit
- fields = ('unit', 'gram', 'amount')
title = gettext_lazy('Delete?')
permission_required = 'nutrition.add_ingredientweightunit'
diff --git a/wger/utils/context_processor.py b/wger/utils/context_processor.py
index 8948e53c1..a7077b82f 100644
--- a/wger/utils/context_processor.py
+++ b/wger/utils/context_processor.py
@@ -29,6 +29,7 @@ def processor(request):
full_path = request.get_full_path()
i18n_path = {}
static_path = static('images/logos/logo-social.png')
+ is_ajax = request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest'
for lang in settings.LANGUAGES:
i18n_path[lang[0]] = '/{0}{1}'.format(lang[0], full_path[3:])
@@ -69,8 +70,8 @@ def processor(request):
# current gym, if available
'custom_header': get_custom_header(request),
- # Template to extend in forms, kinda ugly
- 'extend_template': 'base_empty.html' if request.is_ajax() else 'base.html'
+ # Template to extend in forms, kinda ugly but will be removed in the future
+ 'extend_template': 'base_empty.html' if is_ajax else 'base.html'
}
# Pseudo-intelligent navigation here
diff --git a/wger/utils/generic_views.py b/wger/utils/generic_views.py
index d05d663f6..a01756cf1 100644
--- a/wger/utils/generic_views.py
+++ b/wger/utils/generic_views.py
@@ -254,7 +254,7 @@ class WgerFormMixin(ModelFormMixin):
return super(WgerFormMixin, self).form_valid(form)
-class WgerDeleteMixin(ModelFormMixin):
+class WgerDeleteMixin:
form_action = ''
form_action_urlname = ''
title = ''
diff --git a/wger/weight/urls.py b/wger/weight/urls.py
index 9667d9331..a6b81b7ad 100644
--- a/wger/weight/urls.py
+++ b/wger/weight/urls.py
@@ -16,9 +16,11 @@
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
# Django
-from django.conf.urls import url
from django.contrib.auth.decorators import login_required
-from django.urls import path
+from django.urls import (
+ path,
+ re_path,
+)
# wger
from wger.weight import views
@@ -51,7 +53,7 @@ urlpatterns = [
login_required(views.WeightCsvImportFormPreview(WeightCsvImportForm)),
name='import-csv',
),
- url(
+ re_path(
'overview',
views.overview,
name='overview',
diff --git a/wger/weight/views.py b/wger/weight/views.py
index f175f023f..58487dd96 100644
--- a/wger/weight/views.py
+++ b/wger/weight/views.py
@@ -118,8 +118,6 @@ class WeightDeleteView(WgerDeleteMixin, LoginRequiredMixin, DeleteView):
"""
model = WeightEntry
- fields = ('weight', )
-
messages = gettext_lazy('Successfully deleted.')
def get_context_data(self, **kwargs):