Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Fix crispy forms

Roland Geider63d537d2708d
diff --git a/requirements.txt b/requirements.txt
index 0ff7a63bc..786992768 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,6 +4,7 @@
# Application
bleach[css]~=5.0
+crispy-bootstrap5==0.7
django-bootstrap-breadcrumbs~=0.9
django-formtools~=2.4
django-recaptcha~=3.0.0
@@ -26,6 +27,7 @@ reportlab==3.6.12
requests==2.28.1
+
# AWS
#boto3
diff --git a/wger/core/forms.py b/wger/core/forms.py
index 1b29c115b..be370a5a0 100644
--- a/wger/core/forms.py
+++ b/wger/core/forms.py
@@ -65,8 +65,8 @@ class UserLoginForm(AuthenticationForm):
self.helper.form_class = 'wger-form'
self.helper.layout = Layout(
Row(
- Column('username', css_class='form-group col-6 mb-0'),
- Column('password', css_class='form-group col-6 mb-0'),
+ Column('username', css_class='col-6'),
+ Column('password', css_class='col-6'),
css_class='form-row'
)
)
@@ -115,8 +115,8 @@ class UserPreferencesForm(forms.ModelForm):
Fieldset(
_("Personal data"), 'email',
Row(
- Column('first_name', css_class='form-group col-6 mb-0'),
- Column('last_name', css_class='form-group col-6 mb-0'),
+ Column('first_name', css_class='col-6'),
+ Column('last_name', css_class='col-6'),
css_class='form-row'
), 'birthdate', HTML("<hr>")
),
@@ -148,7 +148,7 @@ class UserEmailForm(forms.ModelForm):
class Meta:
model = User
- fields = ('email', )
+ fields = ('email',)
def clean_email(self):
"""
@@ -232,8 +232,8 @@ class RegistrationForm(UserCreationForm, UserEmailForm):
self.helper.layout = Layout(
'username', 'email',
Row(
- Column('password1', css_class='form-group col-6 mb-0'),
- Column('password2', css_class='form-group col-6 mb-0'),
+ Column('password1', css_class='col-6'),
+ Column('password2', css_class='col-6'),
css_class='form-row'
), 'captcha',
ButtonHolder(Submit('submit', _("Register"), css_class='btn-success btn-block'))
@@ -252,8 +252,8 @@ class RegistrationFormNoCaptcha(UserCreationForm, UserEmailForm):
self.helper.layout = Layout(
'username', 'email',
Row(
- Column('password1', css_class='form-group col-6 mb-0'),
- Column('password2', css_class='form-group col-6 mb-0'),
+ Column('password1', css_class='col-6'),
+ Column('password2', css_class='col-6'),
css_class='form-row'
), ButtonHolder(Submit('submit', _("Register"), css_class='btn-success btn-block'))
)
diff --git a/wger/core/views/user.py b/wger/core/views/user.py
index f4a5326bb..366a58d16 100644
--- a/wger/core/views/user.py
+++ b/wger/core/views/user.py
@@ -104,7 +104,6 @@ from wger.utils.generic_views import (
)
from wger.weight.models import WeightEntry
-
logger = logging.getLogger(__name__)
@@ -136,11 +135,11 @@ def delete(request, user_pk=None):
# Forbidden if the user has not enough rights, doesn't belong to the
# gym or is an admin as well. General admins can delete all users.
if not request.user.has_perm('gym.manage_gyms') \
- and (not request.user.has_perm('gym.manage_gym')
- or request.user.userprofile.gym_id != user.userprofile.gym_id
- or user.has_perm('gym.manage_gym')
- or user.has_perm('gym.gym_trainer')
- or user.has_perm('gym.manage_gyms')):
+ and (not request.user.has_perm('gym.manage_gym')
+ or request.user.userprofile.gym_id != user.userprofile.gym_id
+ or user.has_perm('gym.manage_gym')
+ or user.has_perm('gym.gym_trainer')
+ or user.has_perm('gym.manage_gyms')):
return HttpResponseForbidden()
else:
user = request.user
@@ -179,14 +178,14 @@ def trainer_login(request, user_pk):
# No changing if identity is not set
if not request.user.has_perm('gym.gym_trainer') \
- and not request.session.get('trainer.identity'):
+ and not request.session.get('trainer.identity'):
return HttpResponseForbidden()
# Changing between trainers or managers is not allowed
if request.user.has_perm('gym.gym_trainer') \
- and (user.has_perm('gym.gym_trainer')
- or user.has_perm('gym.manage_gym')
- or user.has_perm('gym.manage_gyms')):
+ and (user.has_perm('gym.gym_trainer')
+ or user.has_perm('gym.manage_gym')
+ or user.has_perm('gym.manage_gyms')):
return HttpResponseForbidden()
# Changing is only allowed between the same gym
@@ -380,7 +379,7 @@ class UserDeactivateView(
return HttpResponseForbidden()
if (request.user.has_perm('gym.manage_gym') or request.user.has_perm('gym.gym_trainer')) \
- and edit_user.userprofile.gym_id != request.user.userprofile.gym_id:
+ and edit_user.userprofile.gym_id != request.user.userprofile.gym_id:
return HttpResponseForbidden()
return super(UserDeactivateView, self).dispatch(request, *args, **kwargs)
@@ -415,7 +414,7 @@ class UserActivateView(
return HttpResponseForbidden()
if (request.user.has_perm('gym.manage_gym') or request.user.has_perm('gym.gym_trainer')) \
- and edit_user.userprofile.gym_id != request.user.userprofile.gym_id:
+ and edit_user.userprofile.gym_id != request.user.userprofile.gym_id:
return HttpResponseForbidden()
return super(UserActivateView, self).dispatch(request, *args, **kwargs)
@@ -455,8 +454,8 @@ class UserEditView(
return HttpResponseForbidden()
if user.has_perm('gym.manage_gym') \
- and not user.has_perm('gym.manage_gyms') \
- and user.userprofile.gym != self.get_object().userprofile.gym:
+ and not user.has_perm('gym.manage_gyms') \
+ and user.userprofile.gym != self.get_object().userprofile.gym:
return HttpResponseForbidden()
return super(UserEditView, self).dispatch(request, *args, **kwargs)
@@ -520,8 +519,8 @@ class UserDetailView(LoginRequiredMixin, WgerMultiplePermissionRequiredMixin, De
return HttpResponseForbidden()
if (user.has_perm('gym.manage_gym') or user.has_perm('gym.gym_trainer')) \
- and not user.has_perm('gym.manage_gyms') \
- and user.userprofile.gym != self.get_object().userprofile.gym:
+ and not user.has_perm('gym.manage_gyms') \
+ and user.userprofile.gym != self.get_object().userprofile.gym:
return HttpResponseForbidden()
return super(UserDetailView, self).dispatch(request, *args, **kwargs)
@@ -543,10 +542,10 @@ class UserDetailView(LoginRequiredMixin, WgerMultiplePermissionRequiredMixin, De
}
)
context['workouts'] = out
- context['weight_entries'] = WeightEntry.objects.filter(user=self.object)\
- .order_by('-date')[:5]
- context['nutrition_plans'] = NutritionPlan.objects.filter(user=self.object)\
- .order_by('-creation_date')[:5]
+ context['weight_entries'] = WeightEntry.objects.filter(user=self.object) \
+ .order_by('-date')[:5]
+ context['nutrition_plans'] = NutritionPlan.objects.filter(user=self.object) \
+ .order_by('-creation_date')[:5]
context['session'] = WorkoutSession.objects.filter(user=self.object).order_by('-date')[:10]
context['admin_notes'] = AdminUserNote.objects.filter(member=self.object)[:5]
context['contracts'] = Contract.objects.filter(member=self.object)[:5]
@@ -564,7 +563,7 @@ class UserListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
Overview of all users in the instance
"""
model = User
- permission_required = ('gym.manage_gyms', )
+ permission_required = ('gym.manage_gyms',)
template_name = 'user/list.html'
def get_queryset(self):
@@ -609,8 +608,8 @@ class WgerPasswordChangeView(PasswordChangeView):
form.helper.layout = Layout(
'old_password',
Row(
- Column('new_password1', css_class='form-group col-6 mb-0'),
- Column('new_password2', css_class='form-group col-6 mb-0'),
+ Column('new_password1', css_class='col-6'),
+ Column('new_password2', css_class='col-6'),
css_class='form-row'
), ButtonHolder(Submit('submit', _("Save"), css_class='btn-success btn-block'))
)
diff --git a/wger/manager/forms.py b/wger/manager/forms.py
index cf1a03d24..3be62a30e 100644
--- a/wger/manager/forms.py
+++ b/wger/manager/forms.py
@@ -69,7 +69,6 @@ from wger.utils.widgets import (
class WorkoutForm(ModelForm):
-
class Meta:
model = Workout
fields = (
@@ -79,7 +78,6 @@ class WorkoutForm(ModelForm):
class WorkoutMakeTemplateForm(ModelForm):
-
class Meta:
model = Workout
fields = (
@@ -102,10 +100,9 @@ class WorkoutCopyForm(Form):
class DayForm(ModelForm):
-
class Meta:
model = Day
- exclude = ('training', )
+ exclude = ('training',)
widgets = {'day': TranslatedSelectMultiple()}
def __init__(self, *args, **kwargs):
@@ -127,7 +124,6 @@ class OrderedModelMultipleChoiceField(ModelMultipleChoiceField):
class SetForm(ModelForm):
-
exercises = OrderedModelMultipleChoiceField(
queryset=ExerciseBase.objects.all(),
label=_('Exercises'),
@@ -146,7 +142,6 @@ class SetForm(ModelForm):
class SettingForm(ModelForm):
-
class Meta:
model = Setting
exclude = ('set', 'exercise', 'order', 'name')
@@ -193,7 +188,7 @@ class WorkoutLogForm(ModelForm):
class Meta:
model = WorkoutLog
- exclude = ('workout', )
+ exclude = ('workout',)
class WorkoutLogFormHelper(FormHelper):
@@ -204,11 +199,11 @@ class WorkoutLogFormHelper(FormHelper):
self.layout = Layout(
'id',
Row(
- Column('reps', css_class='form-group col-2 mb-0'),
- Column('repetition_unit', css_class='form-group col-3 mb-0'),
- Column('weight', css_class='form-group col-2 mb-0'),
- Column('weight_unit', css_class='form-group col-3 mb-0'),
- Column('rir', css_class='form-group col-2 mb-0'),
+ Column('reps', css_class='col-2'),
+ Column('repetition_unit', css_class='col-3'),
+ Column('weight', css_class='col-2'),
+ Column('weight_unit', css_class='col-3'),
+ Column('rir', css_class='col-2'),
css_class='form-row'
),
)
@@ -232,14 +227,14 @@ class HelperWorkoutSessionForm(ModelForm):
self.helper = FormHelper()
self.helper.layout = Layout(
Row(
- Column('date', css_class='form-group col-6 mb-0'),
- Column('impression', css_class='form-group col-6 mb-0'),
+ Column('date', css_class='col-6'),
+ Column('impression', css_class='col-6'),
css_class='form-row'
),
'notes',
Row(
- Column('time_start', css_class='form-group col-6 mb-0'),
- Column('time_end', css_class='form-group col-6 mb-0'),
+ Column('time_start', css_class='col-6'),
+ Column('time_end', css_class='col-6'),
css_class='form-row'
),
)
@@ -262,8 +257,8 @@ class WorkoutSessionForm(ModelForm):
'impression',
'notes',
Row(
- Column('time_start', css_class='form-group col-6 mb-0'),
- Column('time_end', css_class='form-group col-6 mb-0'),
+ Column('time_start', css_class='col-6'),
+ Column('time_end', css_class='col-6'),
css_class='form-row'
),
)
diff --git a/wger/nutrition/forms.py b/wger/nutrition/forms.py
index 6252599cd..071a4b730 100644
--- a/wger/nutrition/forms.py
+++ b/wger/nutrition/forms.py
@@ -48,7 +48,6 @@ from wger.nutrition.models import (
)
from wger.utils.widgets import Html5NumberInput
-
logger = logging.getLogger(__name__)
@@ -85,8 +84,8 @@ class UnitChooserForm(forms.Form):
self.helper = FormHelper()
self.helper.layout = Layout(
Row(
- Column('amount', css_class='form-group col-6 mb-0'),
- Column('unit', css_class='form-group col-6 mb-0'),
+ Column('amount', css_class='col-6'),
+ Column('unit', css_class='col-6'),
css_class='form-row'
)
)
@@ -106,7 +105,7 @@ class BmiForm(forms.ModelForm):
class Meta:
model = UserProfile
- fields = ('height', )
+ fields = ('height',)
def __init__(self, *args, **kwargs):
super(BmiForm, self).__init__(*args, **kwargs)
@@ -117,8 +116,8 @@ class BmiForm(forms.ModelForm):
self.helper.form_id = 'bmi-form'
self.helper.layout = Layout(
Row(
- Column('height', css_class='form-group col-6 mb-0'),
- Column('weight', css_class='form-group col-6 mb-0'),
+ Column('height', css_class='col-6'),
+ Column('weight', css_class='col-6'),
css_class='form-row'
), ButtonHolder(Submit('submit', _("Calculate"), css_class='btn-success'))
)
@@ -169,18 +168,18 @@ class PhysicalActivitiesForm(forms.ModelForm):
self.helper.layout = Layout(
"sleep_hours",
Row(
- Column('work_hours', css_class='form-group col-6 mb-0'),
- Column('work_intensity', css_class='form-group col-6 mb-0'),
+ Column('work_hours', css_class='col-6'),
+ Column('work_intensity', css_class='col-6'),
css_class='form-row'
),
Row(
- Column('sport_hours', css_class='form-group col-6 mb-0'),
- Column('sport_intensity', css_class='form-group col-6 mb-0'),
+ Column('sport_hours', css_class='col-6'),
+ Column('sport_intensity', css_class='col-6'),
css_class='form-row'
),
Row(
- Column('freetime_hours', css_class='form-group col-6 mb-0'),
- Column('freetime_intensity', css_class='form-group col-6 mb-0'),
+ Column('freetime_hours', css_class='col-6'),
+ Column('freetime_intensity', css_class='col-6'),
css_class='form-row'
)
)
@@ -213,7 +212,7 @@ class DailyCaloriesForm(forms.ModelForm):
class Meta:
model = UserProfile
- fields = ('calories', )
+ fields = ('calories',)
def __init__(self, *args, **kwargs):
super(DailyCaloriesForm, self).__init__(*args, **kwargs)
@@ -257,8 +256,8 @@ class MealItemForm(forms.ModelForm):
self.helper.layout = Layout(
'ingredient', 'ingredient_searchfield', HTML('<div id="ingredient_name"></div>'),
Row(
- Column('amount', css_class='form-group col-6 mb-0'),
- Column('weight_unit', css_class='form-group col-6 mb-0'),
+ Column('amount', css_class='col-6'),
+ Column('weight_unit', css_class='col-6'),
css_class='form-row'
)
)
@@ -295,14 +294,13 @@ class MealLogItemForm(MealItemForm):
self.helper.layout = Layout(
'ingredient', 'ingredient_searchfield',
Row(
- Column('amount', css_class='form-group col-6 mb-0'),
- Column('weight_unit', css_class='form-group col-6 mb-0'),
- ), Row(Column('datetime', css_class='form-group col-6 mb-0'), css_class='form-row')
+ Column('amount', css_class='col-6'),
+ Column('weight_unit', css_class='col-6'),
+ ), Row(Column('datetime', css_class='col-6'), css_class='form-row')
)
class IngredientForm(forms.ModelForm):
-
class Meta:
model = Ingredient
fields = [
@@ -326,27 +324,27 @@ class IngredientForm(forms.ModelForm):
self.helper = FormHelper()
self.helper.layout = Layout(
Row(
- Column('name', css_class='form-group col-6 mb-0'),
- Column('brand', css_class='form-group col-6 mb-0'),
+ Column('name', css_class='col-6'),
+ Column('brand', css_class='col-6'),
css_class='form-row'
),
'energy',
'protein',
Row(
- Column('carbohydrates', css_class='form-group col-6 mb-0'),
- Column('carbohydrates_sugar', css_class='form-group col-6 mb-0'),
+ Column('carbohydrates', css_class='col-6'),
+ Column('carbohydrates_sugar', css_class='col-6'),
css_class='form-row'
),
Row(
- Column('fat', css_class='form-group col-6 mb-0'),
- Column('fat_saturated', css_class='form-group col-6 mb-0'),
+ Column('fat', css_class='col-6'),
+ Column('fat_saturated', css_class='col-6'),
css_class='form-row'
),
'fibres',
'sodium',
Row(
- Column('license', css_class='form-group col-6 mb-0'),
- Column('license_author', css_class='form-group col-6 mb-0'),
+ Column('license', css_class='col-6'),
+ Column('license_author', css_class='col-6'),
css_class='form-row'
),
)
diff --git a/wger/settings_global.py b/wger/settings_global.py
index da5835a70..7084b085c 100644
--- a/wger/settings_global.py
+++ b/wger/settings_global.py
@@ -20,7 +20,6 @@ import os
import re
from datetime import timedelta
-
"""
This file contains the global settings that don't usually need to be changed.
For a full list of options, visit:
@@ -78,6 +77,7 @@ INSTALLED_APPS = (
# Form renderer helper
'crispy_forms',
+ 'crispy_bootstrap5',
# REST-API
'rest_framework',
@@ -166,7 +166,7 @@ TEMPLATES = [
'django.template.loaders.app_directories.Loader',
],
'debug':
- False
+ False
},
},
]
@@ -236,7 +236,7 @@ LANGUAGES = (
LANGUAGE_CODE = 'en'
# All translation files are in one place
-LOCALE_PATHS = (os.path.join(SITE_ROOT, 'locale'), )
+LOCALE_PATHS = (os.path.join(SITE_ROOT, 'locale'),)
# Primary keys are AutoFields
DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
@@ -304,7 +304,8 @@ AXES_CACHE = 'default'
#
# Django Crispy Templates
#
-CRISPY_TEMPLATE_PACK = 'bootstrap4'
+CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap5"
+CRISPY_TEMPLATE_PACK = 'bootstrap5'
#
# Easy thumbnails
@@ -408,15 +409,15 @@ COMPRESS_ROOT = STATIC_ROOT
# Django Rest Framework
#
REST_FRAMEWORK = {
- 'DEFAULT_PERMISSION_CLASSES': ('wger.utils.permissions.WgerPermission', ),
+ 'DEFAULT_PERMISSION_CLASSES': ('wger.utils.permissions.WgerPermission',),
'DEFAULT_PAGINATION_CLASS':
- 'rest_framework.pagination.LimitOffsetPagination',
+ 'rest_framework.pagination.LimitOffsetPagination',
'PAGE_SIZE':
- 20,
+ 20,
'PAGINATE_BY_PARAM':
- 'limit', # Allow client to override, using `?limit=xxx`.
+ 'limit', # Allow client to override, using `?limit=xxx`.
'TEST_REQUEST_DEFAULT_FORMAT':
- 'json',
+ 'json',
'DEFAULT_AUTHENTICATION_CLASSES': (
'rest_framework.authentication.SessionAuthentication',
'rest_framework.authentication.TokenAuthentication',
@@ -452,7 +453,7 @@ CORS_URLS_REGEX = r'^/api/.*$'
#
# Ignore these URLs if they cause 404
#
-IGNORABLE_404_URLS = (re.compile(r'^/favicon\.ico$'), )
+IGNORABLE_404_URLS = (re.compile(r'^/favicon\.ico$'),)
#
# Password rules