Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Don't shadow django's view names

Roland Geidercc0496f1d9f7
diff --git a/wger/core/urls.py b/wger/core/urls.py
index b17402d4c..3a484387e 100644
--- a/wger/core/urls.py
+++ b/wger/core/urls.py
@@ -147,7 +147,7 @@ patterns_license = [
patterns_repetition_units = [
path(
'list',
- repetition_units.ListView.as_view(),
+ repetition_units.UnitListView.as_view(),
name='list',
),
path(
@@ -157,12 +157,12 @@ patterns_repetition_units = [
),
path(
'<int:pk>/edit',
- repetition_units.UpdateView.as_view(),
+ repetition_units.UnitUpdateView.as_view(),
name='edit',
),
path(
'<int:pk>/delete',
- repetition_units.DeleteView.as_view(),
+ repetition_units.UnitDeleteView.as_view(),
name='delete',
),
]
@@ -171,22 +171,22 @@ patterns_repetition_units = [
patterns_weight_units = [
path(
'list',
- weight_units.ListView.as_view(),
+ weight_units.UnitListView.as_view(),
name='list',
),
path(
'add',
- weight_units.AddView.as_view(),
+ weight_units.UnitAddView.as_view(),
name='add',
),
path(
'<int:pk>)/edit',
- weight_units.UpdateView.as_view(),
+ weight_units.UnitUpdateView.as_view(),
name='edit',
),
path(
'<int:pk>/delete',
- weight_units.DeleteView.as_view(),
+ weight_units.UnitDeleteView.as_view(),
name='delete',
),
]
diff --git a/wger/core/views/repetition_units.py b/wger/core/views/repetition_units.py
index 4d2c37389..b2d9fc731 100644
--- a/wger/core/views/repetition_units.py
+++ b/wger/core/views/repetition_units.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
# This file is part of wger Workout Manager.
#
# wger Workout Manager is free software: you can redistribute it and/or modify
@@ -22,7 +20,6 @@ from django.contrib.auth.mixins import (
LoginRequiredMixin,
PermissionRequiredMixin,
)
-from django.http import HttpResponseForbidden
from django.urls import reverse_lazy
from django.utils.translation import (
gettext as _,
@@ -46,7 +43,7 @@ from wger.utils.generic_views import (
logger = logging.getLogger(__name__)
-class ListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
+class UnitListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
"""
Overview of all available setting units
"""
@@ -62,13 +59,13 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Create
"""
model = RepetitionUnit
- fields = ('name',)
+ fields = ('name', 'unit_type', 'multiplier')
title = gettext_lazy('Add')
success_url = reverse_lazy('core:repetition-unit:list')
permission_required = 'core.add_repetitionunit'
-class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, UpdateView):
+class UnitUpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, UpdateView):
"""
View to update an existing setting unit
"""
@@ -82,12 +79,12 @@ class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Upd
"""
Send some additional data to the template
"""
- context = super(UpdateView, self).get_context_data(**kwargs)
+ context = super().get_context_data(**kwargs)
context['title'] = _('Edit {0}').format(self.object)
return context
-class DeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMixin, DeleteView):
+class UnitDeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMixin, DeleteView):
"""
View to delete an existing setting unit
"""
@@ -96,21 +93,10 @@ class DeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMixin, D
success_url = reverse_lazy('core:repetition-unit:list')
permission_required = 'core.delete_repetitionunit'
- def dispatch(self, request, *args, **kwargs):
- """
- Deleting the unit with ID 1 (repetitions) is not allowed
-
- This is the default and is hard coded in a couple of places
- """
- if self.kwargs['pk'] == '1':
- return HttpResponseForbidden()
-
- return super(DeleteView, self).dispatch(request, *args, **kwargs)
-
def get_context_data(self, **kwargs):
"""
Send some additional data to the template
"""
- context = super(DeleteView, self).get_context_data(**kwargs)
+ context = super().get_context_data(**kwargs)
context['title'] = _('Delete {0}?').format(self.object)
return context
diff --git a/wger/core/views/weight_units.py b/wger/core/views/weight_units.py
index 1d8cb90a9..f53cb7198 100644
--- a/wger/core/views/weight_units.py
+++ b/wger/core/views/weight_units.py
@@ -46,7 +46,7 @@ from wger.utils.generic_views import (
logger = logging.getLogger(__name__)
-class ListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
+class UnitListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
"""
Overview of all available weight units
"""
@@ -56,7 +56,7 @@ class ListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
template_name = 'weight_unit/list.html'
-class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, CreateView):
+class UnitAddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, CreateView):
"""
View to add a new weight unit
"""
@@ -68,7 +68,7 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Create
permission_required = 'core.add_weightunit'
-class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, UpdateView):
+class UnitUpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, UpdateView):
"""
View to update an existing weight unit
"""
@@ -82,12 +82,12 @@ class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Upd
"""
Send some additional data to the template
"""
- context = super(UpdateView, self).get_context_data(**kwargs)
+ context = super().get_context_data(**kwargs)
context['title'] = _('Edit {0}').format(self.object)
return context
-class DeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMixin, DeleteView):
+class UnitDeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMixin, DeleteView):
"""
View to delete an existing weight unit
"""
@@ -105,12 +105,12 @@ class DeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMixin, D
if self.kwargs['pk'] == '1':
return HttpResponseForbidden()
- return super(DeleteView, self).dispatch(request, *args, **kwargs)
+ return super().dispatch(request, *args, **kwargs)
def get_context_data(self, **kwargs):
"""
Send some additional data to the template
"""
- context = super(DeleteView, self).get_context_data(**kwargs)
+ context = super().get_context_data(**kwargs)
context['title'] = _('Delete {0}?').format(self.object)
return context