Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'master' into feature/mobile-templates
Roland Geiderbacbce7d37b5
diff --cc docs/changelog.rstindex 943b4e9fa,bc8e3c4d3..203405d93--- a/docs/changelog.rst+++ b/docs/changelog.rst@@@ -2,8 -2,9 +2,7 @@@ Changelo=========2.0 - IN DEVELOPMENT- --------------------- **2020-XX-XX**-====================-+ **2020-xx-xx**Upgrade steps from 1.9:diff --cc extras/docker/development/Dockerfileindex e13f2f11d,1d0f36048..34834a34b--- a/extras/docker/development/Dockerfile+++ b/extras/docker/development/Dockerfile@@@ -45,42 -32,29 +32,30 @@@ RUN pip3 wheel --no-cache-dir --wheel-d######### Final########- FROM wger/base:1.9+ FROM wger/base:2.0-devLABEL maintainer="Roland Geider <[email protected]>"+ARG DOCKER_DIR=./extras/docker/developmentEXPOSE 8000- # Set locale to UTF8, otherwise problems with the encoding can occur, e.g.- # when using the invoke/wger commands and bower- RUN locale-gen en_US.UTF-8- ENV LANG en_US.UTF-8- ENV LANGUAGE en_US:en- ENV LC_ALL en_US.UTF-8-# Set up the application- USER wger- COPY --chown=wger:wger . /home/wger/src- COPY --from=builder /usr/src/app/wheels /wheels- #RUN git clone https://github.com/wger-project/wger.git /home/wger/src-WORKDIR /home/wger/src- RUN python3 -m venv /home/wger/venv- RUN . /home/wger/venv/bin/activate \- && pip install --upgrade pip \- && pip install --no-cache /wheels/* \- && python setup.py develop \- && npm install \- && npm install bower \- && wger create_settings \- --settings-path /home/wger/src/settings.py \- --database-path /home/wger/db/database.sqlite \- && wger bootstrap \- --settings-path /home/wger/src/settings.py \- --no-start-server+ COPY --chown=wger:wger . /home/wger/src+ COPY --from=builder /wheels /wheels+ COPY ${DOCKER_DIR}/settings.py /home/wger/src+ COPY ${DOCKER_DIR}/settings.py /tmp/+ COPY ${DOCKER_DIR}/entrypoint.sh /home/wger/entrypoint.sh+ RUN chmod +x /home/wger/entrypoint.sh+ RUN pip3 install --no-cache /wheels/* \+ && pip3 install psycopg2-binary \+ && pip3 install django-redis \+ && python3 setup.py develop \+ && npm install -g bower++ RUN chown -R wger:wger .- # Download the exercise images+ USER wgerRUN mkdir ~/media \- && sed -i "/^MEDIA_ROOT/c\MEDIA_ROOT='\/home\/wger\/media'" settings.py+ && mkdir ~/db/- CMD ["/bin/bash"]+ CMD ["/home/wger/entrypoint.sh"]diff --cc wger/config/views/gym_config.pyindex 65e7546b1,ad1021032..6eb999732--- a/wger/config/views/gym_config.py+++ b/wger/config/views/gym_config.py@@@ -38,10 -41,15 +38,10 @@@ class GymConfigUpdateView(WgerFormMixinfields = '__all__'permission_required = 'config.change_gymconfig'success_url = reverse_lazy('gym:gym:list')+ title = ugettext_lazy('Edit')def get_object(self):- '''+ """Return the only gym config object- '''+ """return GymConfig.objects.get(pk=1)-- def get_context_data(self, **kwargs):- context = super(GymConfigUpdateView, self).get_context_data(**kwargs)- context['form_action'] = reverse('config:gym_config:edit')- context['title'] = _('Edit')- return contextdiff --cc wger/config/views/language_config.pyindex d632bec5d,079f16d3b..73276d24e--- a/wger/config/views/language_config.py+++ b/wger/config/views/language_config.py@@@ -44,10 -47,17 +44,10 @@@ class LanguageConfigUpdateView(WgerFormmodel = LanguageConfigfields = ['show']permission_required = 'config.change_languageconfig'+ title = ugettext_lazy('Edit')def get_success_url(self):- '''+ """Return to the language page- '''+ """return reverse_lazy('core:language:view', kwargs={'pk': self.object.language_id})-- def get_context_data(self, **kwargs):- context = super(LanguageConfigUpdateView, self).get_context_data(**kwargs)- context['form_action'] = reverse('config:language_config:edit',- kwargs={'pk': self.object.id})- context['title'] = _('Edit')-- return contextdiff --cc wger/core/api/resources.pyindex 000000000,19e98b2ad..e69de29bbmode 000000,100644..100644--- a/wger/core/api/resources.py+++ b/wger/core/api/resources.pydiff --cc wger/core/forms.pyindex 962fe00ed,2efd29451..3f0733152--- a/wger/core/forms.py+++ b/wger/core/forms.py@@@ -51,23 -39,12 +51,23 @@@ from wger.core.models import UserProfilclass UserLoginForm(AuthenticationForm):- '''+ """Form for logins- '''-- Overwritten here just to change the label on the 'username' field+ """- username = forms.CharField(label=_("Username or email"), max_length=254)++ def __init__(self, *args, **kwargs):+ super(UserLoginForm, self).__init__(*args, **kwargs)++ self.helper = FormHelper()+ self.helper.add_input(Submit('submit', _('Login'), css_class='btn-success btn-block'))+ 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'),+ css_class='form-row'+ )+ )class UserPreferencesForm(forms.ModelForm):@@@ -189,27 -122,21 +189,27 @@@ class PasswordConfirmationForm(Form)def __init__(self, user, data=None):self.user = usersuper(PasswordConfirmationForm, self).__init__(data=data)+ self.helper = FormHelper()+ self.helper.layout = Layout(+ 'password',+ ButtonHolder(Submit('submit', _("Delete"), css_class='btn-danger btn-block'))+ )def clean_password(self):- '''+ """Check that the password supplied matches the one for the user- '''+ """password = self.cleaned_data.get('password', None)if not self.user.check_password(password):raise ValidationError(_('Invalid password'))return self.cleaned_data.get("password")+class RegistrationForm(UserCreationForm, UserEmailForm):- '''+ """Registration form- '''+ """# Manually set the language to 'en', otherwise the language used seems to# randomly one of the application languages. This also appears to happen@@@ -220,24 -147,14 +220,24 @@@class RegistrationFormNoCaptcha(UserCreationForm, UserEmailForm):- '''+ """Registration form without captcha field- '''-- This is used when registering through an app, in that case there is not- such a spam danger and simplifies the registration process on a mobile- device.+ """- pass++ def __init__(self, *args, **kwargs):+ super(RegistrationFormNoCaptcha, self).__init__(*args, **kwargs)+ self.helper = FormHelper()+ self.helper.form_class = 'wger-form'+ 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'),+ css_class='form-row'+ ),+ ButtonHolder(Submit('submit', _("Register"), css_class='btn-success btn-block'))+ )class FeedbackRegisteredForm(forms.Form):diff --cc wger/core/templatetags/wger_extras.pyindex 32b4bf8b4,723a5d209..d17ac00da--- a/wger/core/templatetags/wger_extras.py+++ b/wger/core/templatetags/wger_extras.py@@@ -149,14 -149,15 +149,14 @@@ def auto_link_css(mobile=False, css='')@register.simple_tag-def fa_class(class_name='', size='', fixed_width=True):+def fa_class(class_name='', icon_type='fas', fixed_width=True):- '''+ """Helper function to help add font awesome classes to elements:param class_name: the CSS class name, without the "fa-" prefix- :param size: the size of the icon:param fixed_width: toggle for fixed icon width:return: the complete CSS classes- '''+ """css = ''if not class_name:return cssdiff --cc wger/core/views/languages.pyindex ea39c4126,6e5b61580..30910959b--- a/wger/core/views/languages.py+++ b/wger/core/views/languages.py@@@ -49,10 -50,10 +49,10 @@@ from wger.utils.generic_views importlogger = logging.getLogger(__name__)-class LanguageListView(LoginRequiredMixin, PermissionRequiredMixin, UAAwareViewMixin, ListView):+class LanguageListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):- '''+ """Show an overview of all languages- '''+ """model = Languagetemplate_name = 'language/overview.html'context_object_name = 'language_list'@@@ -89,11 -91,14 +89,11 @@@ class LanguageDeleteView(WgerDeleteMixipermission_required = 'core.delete_language'def get_context_data(self, **kwargs):- '''+ """Send some additional data to the template- '''+ """context = super(LanguageDeleteView, self).get_context_data(**kwargs)-context['title'] = _(u'Delete {0}?').format(self.object.full_name)- context['form_action'] = reverse('core:language:delete', kwargs={'pk': self.object.id})-return contextdiff --cc wger/core/views/license.pyindex 458e704b9,ba560170f..62607b357--- a/wger/core/views/license.py+++ b/wger/core/views/license.py@@@ -45,10 -49,10 +45,10 @@@ from wger.utils.generic_views importlogger = logging.getLogger(__name__)-class LicenseListView(LoginRequiredMixin, PermissionRequiredMixin, UAAwareViewMixin, ListView):+class LicenseListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):- '''+ """Overview of all available licenses- '''+ """model = Licensepermission_required = 'core.add_license'template_name = 'license/list.html'@@@ -77,10 -82,11 +77,10 @@@ class LicenseUpdateView(WgerFormMixin,permission_required = 'core.change_license'def get_context_data(self, **kwargs):- '''+ """Send some additional data to the template- '''+ """context = super(LicenseUpdateView, self).get_context_data(**kwargs)- context['form_action'] = reverse('core:license:edit', kwargs={'pk': self.object.id})context['title'] = _(u'Edit {0}').format(self.object)return context@@@ -96,9 -102,10 +96,9 @@@ class LicenseDeleteView(WgerDeleteMixinpermission_required = 'core.delete_license'def get_context_data(self, **kwargs):- '''+ """Send some additional data to the template- '''+ """context = super(LicenseDeleteView, self).get_context_data(**kwargs)context['title'] = _(u'Delete {0}?').format(self.object)- context['form_action'] = reverse('core:license:delete', kwargs={'pk': self.kwargs['pk']})return contextdiff --cc wger/core/views/repetition_units.pyindex 21c22bed5,d725969da..5940e6127--- a/wger/core/views/repetition_units.py+++ b/wger/core/views/repetition_units.py@@@ -46,10 -47,10 +46,10 @@@ from wger.utils.generic_views importlogger = logging.getLogger(__name__)-class ListView(LoginRequiredMixin, PermissionRequiredMixin, UAAwareViewMixin, ListView):+class ListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):- '''+ """Overview of all available setting units- '''+ """model = RepetitionUnitpermission_required = 'core.add_repetitionunit'template_name = 'repetition_unit/list.html'@@@ -94,9 -97,10 +94,9 @@@ class DeleteView(WgerDeleteMixin, Loginmodel = RepetitionUnitsuccess_url = reverse_lazy('core:repetition-unit:list')permission_required = 'core.delete_repetitionunit'- form_action_urlname = 'core:repetition-unit:delete'def dispatch(self, request, *args, **kwargs):- '''+ """Deleting the unit with ID 1 (repetitions) is not allowedThis is the default and is hard coded in a couple of placesdiff --cc wger/core/views/user.pyindex fde7b71e3,dab422db5..233d29110--- a/wger/core/views/user.py+++ b/wger/core/views/user.py@@@ -111,17 -94,17 +111,17 @@@ logger = logging.getLogger(__name__def login(request):- '''+ """Small wrapper around the django login view- '''+ """- context = {'active_tab': USER_TAB}- if request.GET.get('next'):- context['next'] = request.GET.get('next')+ next_url = "?next=" + request.GET.get('next') if request.GET.get('next') else ''++ form = UserLoginForm+ form.helper.form_action = reverse('core:user:login') + next_urlreturn LoginView.as_view(template_name='user/login.html',- authentication_form=UserLoginForm,- extra_context=context)+ authentication_form=form)@login_required()@@@ -444,10 -433,11 +444,10 @@@ class UserEditView(WgerFormMixinreturn reverse('core:user:overview', kwargs={'pk': self.kwargs['pk']})def get_context_data(self, **kwargs):- '''+ """Send some additional data to the template- '''+ """context = super(UserEditView, self).get_context_data(**kwargs)- context['form_action'] = reverse('core:user:edit', kwargs={'pk': self.object.id})context['title'] = _('Edit {0}'.format(self.object))return context@@@ -530,10 -520,10 +530,10 @@@ class UserDetailView(LoginRequiredMixinreturn context-class UserListView(LoginRequiredMixin, PermissionRequiredMixin, UAAwareViewMixin, ListView):+class UserListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):- '''+ """Overview of all users in the instance- '''+ """model = Userpermission_required = ('gym.manage_gyms',)template_name = 'user/list.html'diff --cc wger/core/views/weight_units.pyindex 79ea00085,a299e3c30..191ca578a--- a/wger/core/views/weight_units.py+++ b/wger/core/views/weight_units.py@@@ -46,10 -47,10 +46,10 @@@ from wger.utils.generic_views importlogger = logging.getLogger(__name__)-class ListView(LoginRequiredMixin, PermissionRequiredMixin, UAAwareViewMixin, ListView):+class ListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):- '''+ """Overview of all available weight units- '''+ """model = WeightUnitpermission_required = 'core.add_weightunit'template_name = 'weight_unit/list.html'@@@ -94,9 -97,10 +94,9 @@@ class DeleteView(WgerDeleteMixin, Loginmodel = WeightUnitsuccess_url = reverse_lazy('core:weight-unit:list')permission_required = 'core.delete_weightunit'- form_action_urlname = 'core:weight-unit:delete'def dispatch(self, request, *args, **kwargs):- '''+ """Deleting the unit with ID 1 (repetitions) is not allowedThis is the default and is hard coded in a couple of placesdiff --cc wger/email/views/gym.pyindex 7d384d4d8,1d0617809..a74ed76c4--- a/wger/email/views/gym.py+++ b/wger/email/views/gym.py@@@ -35,12 -35,13 +35,12 @@@ from wger.email.models importLog)from wger.gym.models import Gym-from wger.utils.generic_views import UAAwareViewMixin-class EmailLogListView(PermissionRequiredMixin, UAAwareViewMixin, generic.ListView):+class EmailLogListView(PermissionRequiredMixin, generic.ListView):- '''+ """Shows a list with all sent emails- '''+ """model = Logcontext_object_name = "email_list"diff --cc wger/exercises/api/resources.pyindex 000000000,e20488057..e69de29bbmode 000000,100644..100644--- a/wger/exercises/api/resources.py+++ b/wger/exercises/api/resources.pydiff --cc wger/exercises/views/categories.pyindex fb1a945ea,3d8bf9a34..862602d99--- a/wger/exercises/views/categories.py+++ b/wger/exercises/views/categories.py@@@ -49,10 -50,11 +49,10 @@@ from wger.utils.language import load_lalogger = logging.getLogger(__name__)-class ExerciseCategoryListView(LoginRequiredMixin, PermissionRequiredMixin,- UAAwareViewMixin, ListView):+class ExerciseCategoryListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):- '''+ """Overview of all categories, for administration purposes- '''+ """model = ExerciseCategorypermission_required = 'exercises.change_exercisecategory'template_name = 'categories/admin-overview.html'diff --cc wger/exercises/views/equipment.pyindex fc9db8cef,d2dd813d4..d71520d22--- a/wger/exercises/views/equipment.py+++ b/wger/exercises/views/equipment.py@@@ -50,15 -51,15 +50,15 @@@ from wger.utils.language import load_itlogger = logging.getLogger(__name__)- '''+ """Exercise equipment- '''+ """-class EquipmentListView(LoginRequiredMixin, PermissionRequiredMixin, UAAwareViewMixin, ListView):+class EquipmentListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):- '''+ """Generic view to list all equipments- '''+ """model = Equipmentfields = '__all__'@@@ -96,11 -100,20 +96,11 @@@ class EquipmentAddView(WgerFormMixin, Lpermission_required = 'exercises.add_equipment'success_url = reverse_lazy('exercise:equipment:list')- def get_context_data(self, **kwargs):- """- Send some additional data to the template- """- context = super(EquipmentAddView, self).get_context_data(**kwargs)- context['form_action'] = reverse('exercise:equipment:add')-- return context-class EquipmentDeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMixin, DeleteView):- '''+ """Generic view to delete an existing exercise image- '''+ """model = Equipmentfields = ('name',)@@@ -109,11 -121,24 +109,24 @@@permission_required = 'exercises.delete_equipment'success_url = reverse_lazy('exercise:equipment:list')+ def get_context_data(self, **kwargs):- """++ '''+ Send some additional data to the template- """++ '''+ pk = self.kwargs['pk']+ context = super(EquipmentDeleteView, self).get_context_data(**kwargs)++ context['title'] = _('Delete equipment?')+ context['form_action'] = reverse('exercise:equipment:delete',+ kwargs={'pk': pk})++ return context+-class EquipmentOverviewView(UAAwareViewMixin, ListView):+class EquipmentOverviewView(ListView):- '''+ """Overview with all exercises, group by equipment- '''+ """model = Equipmenttemplate_name = 'equipment/overview.html'diff --cc wger/exercises/views/exercises.pyindex 09197573c,3fce4aa99..bfb3dd4b6--- a/wger/exercises/views/exercises.py+++ b/wger/exercises/views/exercises.py@@@ -90,10 -84,10 +90,10 @@@ from wger.weight.helpers import processlogger = logging.getLogger(__name__)-class ExerciseListView(UAAwareViewMixin, ListView):+class ExerciseListView(ListView):- '''+ """Generic view to list all exercises- '''+ """model = Exercisetemplate_name = 'exercise/overview.html'@@@ -260,14 -238,16 +260,14 @@@ class ExerciseUpdateView(ExercisesEditAclass ExerciseAddView(ExercisesEditAddView, LoginRequiredMixin, CreateView):- '''+ """Generic view to add a new exercise- '''+ """- form_action = reverse_lazy('exercise:exercise:add')-def form_valid(self, form):- '''+ """Set language, author and status- '''+ """form.instance.language = load_language()form.instance.set_author(self.request)return super(ExerciseAddView, self).form_valid(form)@@@ -347,18 -328,22 +347,18 @@@ class ExerciseDeleteView(WgerDeleteMixipermission_required = 'exercises.delete_exercise'def get_context_data(self, **kwargs):- '''+ """Send some additional data to the template- '''+ """context = super(ExerciseDeleteView, self).get_context_data(**kwargs)context['title'] = _(u'Delete {0}?').format(self.object.name)- context['form_action'] = reverse('exercise:exercise:delete',- kwargs={'pk': self.kwargs['pk']})-return context-class PendingExerciseListView(LoginRequiredMixin, PermissionRequiredMixin,- UAAwareViewMixin, ListView):+class PendingExerciseListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):- '''+ """Generic view to list all weight units- '''+ """model = Exercisetemplate_name = 'exercise/pending.html'diff --cc wger/exercises/views/images.pyindex a6e186dc7,43a240026..6f80d4482--- a/wger/exercises/views/images.py+++ b/wger/exercises/views/images.py@@@ -100,11 -103,14 +100,11 @@@ class ExerciseImageAddView(WgerFormMixireturn reverse('exercise:exercise:view', kwargs={'id': self.object.exercise.id})def get_context_data(self, **kwargs):- '''+ """Send some additional data to the template- '''+ """context = super(ExerciseImageAddView, self).get_context_data(**kwargs)context['enctype'] = 'multipart/form-data'- context['form_action'] = reverse('exercise:image:add',- kwargs={'exercise_pk': self.kwargs['exercise_pk']})-return contextdiff --cc wger/exercises/views/muscles.pyindex 9b375c4ee,276ae12c0..e4219ef87--- a/wger/exercises/views/muscles.py+++ b/wger/exercises/views/muscles.py@@@ -50,10 -51,10 +50,10 @@@ from wger.utils.language import load_itlogger = logging.getLogger(__name__)-class MuscleListView(UAAwareViewMixin, ListView):+class MuscleListView(ListView):- '''+ """Overview of all muscles and their exercises- '''+ """model = Musclequeryset = Muscle.objects.all().order_by('-is_front', 'name'),context_object_name = 'muscle_list'@@@ -101,10 -103,11 +101,10 @@@ class MuscleUpdateView(WgerFormMixin, Lpermission_required = 'exercises.change_muscle'def get_context_data(self, **kwargs):- '''+ """Send some additional data to the template- '''+ """context = super(MuscleUpdateView, self).get_context_data(**kwargs)- context['form_action'] = reverse('exercise:muscle:edit', kwargs={'pk': self.object.id})context['title'] = _(u'Edit {0}').format(self.object.name)return context@@@ -121,9 -124,10 +121,9 @@@ class MuscleDeleteView(WgerDeleteMixinmessages = ugettext_lazy('Successfully deleted')def get_context_data(self, **kwargs):- '''+ """Send some additional data to the template- '''+ """context = super(MuscleDeleteView, self).get_context_data(**kwargs)context['title'] = _(u'Delete {0}?').format(self.object.name)- context['form_action'] = reverse('exercise:muscle:delete', kwargs={'pk': self.kwargs['pk']})return contextdiff --cc wger/gym/views/admin_config.pyindex b60672e5f,542432c0a..c275c93fe--- a/wger/gym/views/admin_config.py+++ b/wger/gym/views/admin_config.py@@@ -38,10 -38,18 +38,19 @@@ class ConfigUpdateView(WgerFormMixin, Umodel = GymAdminConfigfields = '__all__'permission_required = 'gym.change_gymadminconfig'+ title = ugettext_lazy('Configuration')def get_success_url(self):- '''+ """Return to the gym user overview- '''+ """return reverse('gym:gym:user-list', kwargs={'pk': self.object.gym.pk})++ def get_context_data(self, **kwargs):+ """+ Send some additional data to the template+ """+ context = super(ConfigUpdateView, self).get_context_data(**kwargs)+ context['form_action'] = reverse('gym:admin_config:edit', kwargs={'pk': self.object.id})+ context['title'] = _('Configuration')+ return contextdiff --cc wger/gym/views/admin_notes.pyindex e83649ed3,9e6e99ba2..694f387f8--- a/wger/gym/views/admin_notes.py+++ b/wger/gym/views/admin_notes.py@@@ -47,10 -48,10 +47,10 @@@ from wger.utils.generic_views importlogger = logging.getLogger(__name__)-class ListView(LoginRequiredMixin, PermissionRequiredMixin, UAAwareViewMixin, ListView):+class ListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):- '''+ """Overview of all available admin notes- '''+ """model = AdminUserNotepermission_required = 'gym.add_adminusernote'template_name = 'admin_notes/list.html'@@@ -76,10 -77,12 +76,10 @@@return super(ListView, self).dispatch(request, *args, **kwargs)def get_context_data(self, **kwargs):- '''+ """Send some additional data to the template- '''+ """context = super(ListView, self).get_context_data(**kwargs)- context['form_action'] = reverse('gym:admin_note:add',- kwargs={'user_pk': self.kwargs['user_pk']})context['member'] = self.memberreturn context@@@ -123,11 -126,20 +123,11 @@@ class AddView(WgerFormMixin, LoginRequiform.instance.user = self.request.userreturn super(AddView, self).form_valid(form)- def get_context_data(self, **kwargs):- """- Send some additional data to the template- """- context = super(AddView, self).get_context_data(**kwargs)- context['form_action'] = reverse('gym:admin_note:add',- kwargs={'user_pk': self.kwargs['user_pk']})- return context-class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, UpdateView):- '''+ """View to update an existing admin note- '''+ """model = AdminUserNotefields = '__all__'@@@ -154,10 -166,11 +154,10 @@@return super(UpdateView, self).dispatch(request, *args, **kwargs)def get_context_data(self, **kwargs):- '''+ """Send some additional data to the template- '''+ """context = super(UpdateView, self).get_context_data(**kwargs)- context['form_action'] = reverse('gym:admin_note:edit', kwargs={'pk': self.object.id})context['title'] = _(u'Edit {0}').format(self.object)return context@@@ -190,9 -203,10 +190,9 @@@ class DeleteView(WgerDeleteMixin, Loginreturn 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['title'] = _(u'Delete {0}?').format(self.object)- context['form_action'] = reverse('gym:admin_note:delete', kwargs={'pk': self.kwargs['pk']})return contextdiff --cc wger/gym/views/config.pyindex 5a765444f,2a28c5196..4d63f163f--- a/wger/gym/views/config.py+++ b/wger/gym/views/config.py@@@ -61,9 -61,10 +61,9 @@@ class GymConfigUpdateView(WgerFormMixinreturn reverse('gym:gym:user-list', kwargs={'pk': self.object.gym.pk})def get_context_data(self, **kwargs):- '''+ """Send some additional data to the template- '''+ """context = super(GymConfigUpdateView, self).get_context_data(**kwargs)- context['form_action'] = reverse('gym:config:edit', kwargs={'pk': self.object.id})context['title'] = _(u'Edit {0}').format(self.object)return contextdiff --cc wger/gym/views/contract.pyindex cca289b16,175807b35..cb498143f--- a/wger/gym/views/contract.py+++ b/wger/gym/views/contract.py@@@ -102,11 -105,20 +102,11 @@@ class AddView(WgerFormMixin, LoginRequiform.instance.user = self.request.userreturn super(AddView, self).form_valid(form)- def get_context_data(self, **kwargs):- """- Send some additional data to the template- """- context = super(AddView, self).get_context_data(**kwargs)- context['form_action'] = reverse('gym:contract:add',- kwargs={'user_pk': self.kwargs['user_pk']})- return context-class DetailView(LoginRequiredMixin, PermissionRequiredMixin, DetailView):- '''+ """Detail view of a member's contract- '''+ """model = Contracttemplate_name = 'contract/view.html'@@@ -133,11 -145,12 +133,11 @@@ class UpdateView(WgerFormMixin, LoginRemodel = Contractfields = '__all__'permission_required = 'gym.change_contract'- form_action_urlname = 'gym:contract:edit'def dispatch(self, request, *args, **kwargs):- '''+ """Only trainers for this gym can edit user notes- '''+ """if not request.user.is_authenticated:return HttpResponseForbidden()@@@ -156,10 -169,10 +156,10 @@@return context-class ListView(LoginRequiredMixin, PermissionRequiredMixin, UAAwareViewMixin, ListView):+class ListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):- '''+ """Overview of all available admin notes- '''+ """model = Contractpermission_required = 'gym.add_contract'template_name = 'contract/list.html'diff --cc wger/gym/views/contract_option.pyindex 2eed2c0dd,5ef0e8dd5..997e3a0d7--- a/wger/gym/views/contract_option.py+++ b/wger/gym/views/contract_option.py@@@ -86,20 -87,30 +86,20 @@@ class AddView(WgerFormMixin, LoginRequiform.instance.gym_id = self.kwargs['gym_pk']return super(AddView, self).form_valid(form)- def get_context_data(self, **kwargs):- """- Send some additional data to the template- """- context = super(AddView, self).get_context_data(**kwargs)- context['form_action'] = reverse('gym:contract-option:add',- kwargs={'gym_pk': self.kwargs['gym_pk']})- return context-class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, UpdateView):- '''+ """View to update an existing contract option- '''+ """model = ContractOptionfields = ('name', 'description')permission_required = 'gym.change_contractoption'- form_action_urlname = 'gym:contract-option:edit'def dispatch(self, request, *args, **kwargs):- '''+ """Can only add contract types in own gym- '''+ """if not request.user.is_authenticated:return HttpResponseForbidden()@@@ -132,11 -143,12 +132,11 @@@ class DeleteView(WgerDeleteMixin, Loginmodel = ContractOptionfields = ('name', 'description')permission_required = 'gym.delete_contractoption'- form_action_urlname = 'gym:contract-option:delete'def dispatch(self, request, *args, **kwargs):- '''+ """Can only add contract option in own gym- '''+ """if not request.user.is_authenticated:return HttpResponseForbidden()@@@ -161,10 -173,10 +161,10 @@@return context-class ListView(LoginRequiredMixin, PermissionRequiredMixin, UAAwareViewMixin, ListView):+class ListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):- '''+ """Overview of all available contract options- '''+ """model = ContractOptionpermission_required = 'gym.add_contractoption'template_name = 'contract_option/list.html'diff --cc wger/gym/views/contract_type.pyindex 68d7c13e4,b37516dc2..d135085f8--- a/wger/gym/views/contract_type.py+++ b/wger/gym/views/contract_type.py@@@ -86,20 -87,30 +86,20 @@@ class AddView(WgerFormMixin, LoginRequiform.instance.gym_id = self.kwargs['gym_pk']return super(AddView, self).form_valid(form)- def get_context_data(self, **kwargs):- """- Send some additional data to the template- """- context = super(AddView, self).get_context_data(**kwargs)- context['form_action'] = reverse('gym:contract_type:add',- kwargs={'gym_pk': self.kwargs['gym_pk']})- return context-class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, UpdateView):- '''+ """View to update an existing contract option- '''+ """model = ContractTypefields = ('name', 'description')permission_required = 'gym.change_contracttype'- form_action_urlname = 'gym:contract_type:edit'def dispatch(self, request, *args, **kwargs):- '''+ """Can only add contract types in own gym- '''+ """if not request.user.is_authenticated:return HttpResponseForbidden()@@@ -132,11 -143,12 +132,11 @@@ class DeleteView(WgerDeleteMixin, Loginmodel = ContractTypefields = ('name', 'description')permission_required = 'gym.delete_contracttype'- form_action_urlname = 'gym:contract_type:delete'def dispatch(self, request, *args, **kwargs):- '''+ """Can only add contract types in own gym- '''+ """if not request.user.is_authenticated:return HttpResponseForbidden()@@@ -161,10 -173,10 +161,10 @@@return context-class ListView(LoginRequiredMixin, PermissionRequiredMixin, UAAwareViewMixin, ListView):+class ListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):- '''+ """Overview of all available contract options- '''+ """model = ContractTypepermission_required = 'gym.add_contracttype'template_name = 'contract_type/list.html'diff --cc wger/gym/views/document.pyindex 96b66bc77,b13e4bf91..f53f1e23e--- a/wger/gym/views/document.py+++ b/wger/gym/views/document.py@@@ -47,10 -48,10 +47,10 @@@ from wger.utils.generic_views importlogger = logging.getLogger(__name__)-class ListView(LoginRequiredMixin, PermissionRequiredMixin, UAAwareViewMixin, ListView):+class ListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):- '''+ """Overview of all available admin notes- '''+ """model = UserDocumentpermission_required = 'gym.add_userdocument'template_name = 'document/list.html'@@@ -76,10 -77,12 +76,10 @@@return super(ListView, self).dispatch(request, *args, **kwargs)def get_context_data(self, **kwargs):- '''+ """Send some additional data to the template- '''+ """context = super(ListView, self).get_context_data(**kwargs)- context['form_action'] = reverse('gym:document:add',- kwargs={'user_pk': self.kwargs['user_pk']})context['member'] = self.memberreturn context@@@ -126,11 -129,13 +126,11 @@@ class AddView(WgerFormMixin, LoginRequireturn super(AddView, self).form_valid(form)def get_context_data(self, **kwargs):- '''+ """Send some additional data to the template- '''+ """context = super(AddView, self).get_context_data(**kwargs)context['enctype'] = 'multipart/form-data'- context['form_action'] = reverse('gym:document:add',- kwargs={'user_pk': self.kwargs['user_pk']})return context@@@ -164,10 -169,11 +164,10 @@@ class UpdateView(WgerFormMixin, LoginRereturn super(UpdateView, self).dispatch(request, *args, **kwargs)def get_context_data(self, **kwargs):- '''+ """Send some additional data to the template- '''+ """context = super(UpdateView, self).get_context_data(**kwargs)- context['form_action'] = reverse('gym:document:edit', kwargs={'pk': self.object.id})context['title'] = _(u'Edit {0}').format(self.object)return context@@@ -200,9 -206,10 +200,9 @@@ class DeleteView(WgerDeleteMixin, Loginreturn 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['title'] = _(u'Delete {0}?').format(self.object)- context['form_action'] = reverse('gym:document:delete', kwargs={'pk': self.kwargs['pk']})return contextdiff --cc wger/gym/views/gym.pyindex 3423666e0,11a64cfdf..b7c764c3a--- a/wger/gym/views/gym.py+++ b/wger/gym/views/gym.py@@@ -80,10 -81,10 +80,10 @@@ from wger.utils.helpers import passwordlogger = logging.getLogger(__name__)-class GymListView(LoginRequiredMixin, PermissionRequiredMixin, UAAwareViewMixin, ListView):+class GymListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):- '''+ """Overview of all available gyms- '''+ """model = Gympermission_required = 'gym.manage_gyms'template_name = 'gym/list.html'@@@ -97,10 -98,11 +97,10 @@@return context-class GymUserListView(LoginRequiredMixin, WgerMultiplePermissionRequiredMixin,- UAAwareViewMixin, ListView):+class GymUserListView(LoginRequiredMixin, WgerMultiplePermissionRequiredMixin, ListView):- '''+ """Overview of all users for a specific gym- '''+ """model = Userpermission_required = ('gym.manage_gym', 'gym.gym_trainer', 'gym.manage_gyms')template_name = 'gym/member_list.html'@@@ -405,11 -409,20 +405,11 @@@ class GymAddUserView(WgerFormMixinreturn super(GymAddUserView, self).form_valid(form)- def get_context_data(self, **kwargs):- """- Send some additional data to the template- """- context = super(GymAddUserView, self).get_context_data(**kwargs)- context['form_action'] = reverse('gym:gym:add-user',- kwargs={'gym_pk': self.kwargs['gym_pk']})- return context-class GymUpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, UpdateView):- '''+ """View to update an existing gym- '''+ """model = Gymfields = '__all__'@@@ -430,10 -443,11 +430,10 @@@return super(GymUpdateView, self).dispatch(request, *args, **kwargs)def get_context_data(self, **kwargs):- '''+ """Send some additional data to the template- '''+ """context = super(GymUpdateView, self).get_context_data(**kwargs)- context['form_action'] = reverse('gym:gym:edit', kwargs={'pk': self.object.id})context['title'] = _(u'Edit {0}').format(self.object)return context@@@ -455,9 -469,10 +455,9 @@@ class GymDeleteView(WgerDeleteMixin, Lopermission_required = 'gym.delete_gym'def get_context_data(self, **kwargs):- '''+ """Send some additional data to the template- '''+ """context = super(GymDeleteView, self).get_context_data(**kwargs)context['title'] = _(u'Delete {0}?').format(self.object)- context['form_action'] = reverse('gym:gym:delete', kwargs={'pk': self.kwargs['pk']})return contextdiff --cc wger/gym/views/user_config.pyindex c7f86db07,f1efb2ba9..4e0259c29--- a/wger/gym/views/user_config.py+++ b/wger/gym/views/user_config.py@@@ -43,12 -43,11 +43,12 @@@ class ConfigUpdateView(WgerFormMixin, Lmodel = GymUserConfigfields = '__all__'permission_required = 'gym.change_gymuserconfig'+ title = ugettext_lazy('Configuration')def dispatch(self, request, *args, **kwargs):- '''+ """Only managers for this gym can edit the user settings- '''+ """if not request.user.is_authenticated:return HttpResponseForbidden()@@@ -60,7 -59,16 +60,7 @@@return super(ConfigUpdateView, self).dispatch(request, *args, **kwargs)def get_success_url(self):- '''+ """Return to the gym user overview- '''+ """return reverse('gym:gym:user-list', kwargs={'pk': self.object.gym.pk})-- def get_context_data(self, **kwargs):- """- Send some additional data to the template- """- context = super(ConfigUpdateView, self).get_context_data(**kwargs)- context['form_action'] = reverse('gym:user_config:edit', kwargs={'pk': self.object.id})- context['title'] = _('Configuration')- return contextdiff --cc wger/manager/api/resources.pyindex 000000000,066e10cc9..e69de29bbmode 000000,100644..100644--- a/wger/manager/api/resources.py+++ b/wger/manager/api/resources.pydiff --cc wger/manager/forms.pyindex d631dc064,dcef77d6e..1d56bbf11--- a/wger/manager/forms.py+++ b/wger/manager/forms.py@@@ -114,8 -130,16 +114,8 @@@ class SettingForm(ModelForm)model = Settingexclude = ('set', 'exercise', 'order', 'comment')--class HelperDateForm(Form):- """- A helper form used in the workout log view- """- date = DateField(input_formats=DATE_FORMATS, widget=Html5DateInput())--class WorkoutLogForm(ModelForm):- '''+ """Helper form for a WorkoutLog.These fields are re-defined here only to make them optional@@@ -140,50 -164,13 +140,50 @@@exclude = ('workout', )+class WorkoutLogFormHelper(FormHelper):+ def __init__(self, *args, **kwargs):+ super().__init__(*args, **kwargs)+ self.form_method = 'post'+ self.layout = Layout(+ Row(+ Column('reps', css_class='form-group col-md-2 col-3 mb-0'),+ Column('repetition_unit', css_class='form-group col-md-4 col-3 mb-0'),+ Column('weight', css_class='form-group col-md-2 col-3 mb-0'),+ Column('weight_unit', css_class='form-group col-md-4 col-3 mb-0'),+ css_class='form-row'+ ),+ )+ self.form_show_labels = False+ self.form_tag = False+ self.disable_csrf = True+ self.render_required_fields = True++class HelperWorkoutSessionForm(ModelForm):- '''+ """A helper form used in the workout log view- '''+ """class Meta:model = WorkoutSession- exclude = ('user', 'workout', 'date')+ exclude = ('user', 'workout')++ def __init__(self, *args, **kwargs):+ super().__init__(*args, **kwargs)+ 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'),+ 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'),+ css_class='form-row'+ ),+ )+ self.helper.form_tag = Falseclass WorkoutSessionForm(ModelForm):@@@ -194,48 -181,11 +194,48 @@@model = WorkoutSessionexclude = ('user', 'workout', 'date')+ def __init__(self, *args, **kwargs):+ super(WorkoutSessionForm, self).__init__(*args, **kwargs)+ self.helper = FormHelper()+ self.helper.layout = Layout(+ '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'),+ css_class='form-row'+ ),+ )+++class WorkoutScheduleDownloadForm(Form):+ """+ Form for the workout schedule download+ """+ pdf_type = ChoiceField(+ label = ugettext_lazy(u"Type"),+ choices=(("log", ugettext_lazy("Log")),+ ("table", ugettext_lazy("Table"))+ ),+ )+ images = BooleanField(label = ugettext_lazy("with images"),+ required=False)+ comments = BooleanField(label = ugettext_lazy("with comments"),+ required=False)++ def __init__(self):+ super(WorkoutScheduleDownloadForm, self).__init__()+ self.helper = FormHelper()+ self.helper.form_tag = False+ self.helper.add_input(Submit('submit', _("Download"),+ css_class='btn-success btn-block',+ css_id="download-pdf-button-schedule"))+class WorkoutSessionHiddenFieldsForm(ModelForm):- '''+ """Workout Session form used in the timer view- '''+ """class Meta:model = WorkoutSessionexclude = []diff --cc wger/manager/views/day.pyindex cf119bca1,16f83835f..77337f4a7--- a/wger/manager/views/day.py+++ b/wger/manager/views/day.py@@@ -90,10 -88,12 +90,10 @@@ class DayView(WgerFormMixin, LoginRequiclass DayEditView(DayView, UpdateView):- '''+ """Generic view to update an existing exercise day- '''+ """- form_action_urlname = 'manager:day:edit'-# Send some additional data to the templatedef get_context_data(self, **kwargs):context = super(DayEditView, self).get_context_data(**kwargs)@@@ -116,11 -116,19 +116,11 @@@ class DayCreateView(DayView, CreateViewform.instance.training = Workout.objects.get(pk=self.kwargs['workout_pk'])return super(DayCreateView, self).form_valid(form)- # Send some additional data to the template- def get_context_data(self, **kwargs):- context = super(DayCreateView, self).get_context_data(**kwargs)- context['form_action'] = reverse('manager:day:add',- kwargs={'workout_pk': self.kwargs['workout_pk']})- return context--@login_requireddef delete(request, pk):- '''+ """Deletes the given day- '''+ """day = get_object_or_404(Day, training__user=request.user, pk=pk)day.delete()return HttpResponseRedirect(reverse('manager:workout:view', kwargs={'pk': day.training_id}))diff --cc wger/manager/views/log.pyindex 590322a86,180072f12..96d89e62e--- a/wger/manager/views/log.py+++ b/wger/manager/views/log.py@@@ -107,13 -109,13 +107,13 @@@ class WorkoutLogDeleteView(WgerDeleteMidef add(request, pk):- '''+ """Add a new workout log- '''+ """- template_data = {}- template_data.update(csrf(request))+ # NOTE: This function is waaaay too complex and convoluted. While updating+ # to crispy forms, the template logic could be reduced a lot, but+ # there is still a lot optimisations that could happen here.# Load the day and check ownershipday = get_object_or_404(Day, pk=pk)diff --cc wger/manager/views/schedule.pyindex ce95ca315,7cfb88303..b1b462f8e--- a/wger/manager/views/schedule.py+++ b/wger/manager/views/schedule.py@@@ -277,9 -273,10 +277,9 @@@ class ScheduleCreateView(WgerFormMixinfields = '__all__'success_url = reverse_lazy('manager:schedule:overview')title = ugettext_lazy('Create schedule')- form_action = reverse_lazy('manager:schedule:add')def form_valid(self, form):- '''set the submitter'''+ """set the submitter"""form.instance.user = self.request.userreturn super(ScheduleCreateView, self).form_valid(form)@@@ -313,11 -311,12 +313,11 @@@ class ScheduleEditView(WgerFormMixin, Umodel = Schedulefields = '__all__'- form_action_urlname = 'manager:schedule:edit'def get_context_data(self, **kwargs):- '''+ """Send some additional data to the template- '''+ """context = super(ScheduleEditView, self).get_context_data(**kwargs)context['title'] = _(u'Edit {0}').format(self.object)return contextdiff --cc wger/manager/views/schedule_step.pyindex ffb5ac28b,90825ddce..455dfba73--- a/wger/manager/views/schedule_step.py+++ b/wger/manager/views/schedule_step.py@@@ -97,9 -103,10 +97,9 @@@ class StepEditView(WgerFormMixin, Updatmodel = ScheduleSteptitle = ugettext_lazy('Edit workout')- form_action_urlname = 'manager:step:edit'def get_form_class(self):- '''+ """The form can only show the workouts belonging to the user.This is defined here because only at this point during the request@@@ -132,9 -140,10 +132,9 @@@ class StepDeleteView(WgerDeleteMixin, Dreturn reverse('manager:schedule:view', kwargs={'pk': self.object.schedule.id})def get_context_data(self, **kwargs):- '''+ """Send some additional data to the template- '''+ """context = super(StepDeleteView, self).get_context_data(**kwargs)context['title'] = _(u'Delete {0}?').format(self.object)- context['form_action'] = reverse('core:license:delete', kwargs={'pk': self.kwargs['pk']})return contextdiff --cc wger/nutrition/api/resources.pyindex 000000000,2b3fc346e..e69de29bbmode 000000,100644..100644--- a/wger/nutrition/api/resources.py+++ b/wger/nutrition/api/resources.pydiff --cc wger/nutrition/forms.pyindex 1f4568cec,3e5f7fb29..f7deea6af--- a/wger/nutrition/forms.py+++ b/wger/nutrition/forms.py@@@ -46,11 -35,10 +46,11 @@@ logger = logging.getLogger(__name__class UnitChooserForm(forms.Form):- '''+ """A small form to select an amount and a unit for an ingredient- '''+ """amount = forms.DecimalField(decimal_places=2,+ label=ugettext_lazy("Amount"),max_digits=5,localize=True)unit = forms.ModelChoiceField(queryset=IngredientWeightUnit.objects.none(),diff --cc wger/nutrition/views/ingredient.pyindex c9a5e03f0,ddabbad5c..9d02036e8--- a/wger/nutrition/views/ingredient.py+++ b/wger/nutrition/views/ingredient.py@@@ -69,10 -68,10 +69,10 @@@ logger = logging.getLogger(__name__# ************************# Ingredient functions# ************************-class IngredientListView(UAAwareViewMixin, ListView):+class IngredientListView(ListView):- '''+ """Show an overview of all ingredients- '''+ """model = Ingredienttemplate_name = 'ingredient/overview.html'context_object_name = 'ingredients_list'@@@ -165,11 -167,12 +165,11 @@@ class IngredientMixin(WgerFormMixin)class IngredientEditView(IngredientMixin, LoginRequiredMixin, PermissionRequiredMixin, UpdateView):- '''+ """Generic view to update an existing ingredient- '''+ """model = Ingredient- form_action_urlname = 'nutrition:ingredient:edit'permission_required = 'nutrition.change_ingredient'def get_context_data(self, **kwargs):@@@ -206,10 -209,11 +206,10 @@@ class IngredientCreateView(IngredientMireturn super(IngredientCreateView, self).dispatch(request, *args, **kwargs)-class PendingIngredientListView(LoginRequiredMixin, PermissionRequiredMixin,- UAAwareViewMixin, ListView):+class PendingIngredientListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):- '''+ """List all ingredients pending review- '''+ """model = Ingredienttemplate_name = 'ingredient/pending.html'diff --cc wger/nutrition/views/meal_item.pyindex 0827782ae,64d4d4e0c..3b6f36a47--- a/wger/nutrition/views/meal_item.py+++ b/wger/nutrition/views/meal_item.py@@@ -85,10 -85,12 +85,10 @@@ class MealItemCreateView(WgerFormMixinreturn reverse('nutrition:plan:view', kwargs={'id': self.meal.plan.id})def get_context_data(self, **kwargs):- '''+ """Send some additional data to the template- '''+ """context = super(MealItemCreateView, self).get_context_data(**kwargs)- context['form_action'] = reverse('nutrition:meal_item:add',- kwargs={'meal_id': self.meal.id})context['ingredient_searchfield'] = self.request.POST.get('ingredient_searchfield', '')return contextdiff --cc wger/nutrition/views/plan.pyindex 9a14dce94,5002fec1d..a36ef3d96--- a/wger/nutrition/views/plan.py+++ b/wger/nutrition/views/plan.py@@@ -132,11 -131,12 +132,11 @@@ class PlanEditView(WgerFormMixin, Updatmodel = NutritionPlanfields = ('description', 'has_goal_calories')- form_action_urlname = 'nutrition:plan:edit'def get_context_data(self, **kwargs):- '''+ """Send some additional data to the template- '''+ """context = super(PlanEditView, self).get_context_data(**kwargs)context['title'] = _(u'Edit {0}').format(self.object)return contextdiff --cc wger/nutrition/views/unit.pyindex c6e6429b2,24d44c61d..8451736a0--- a/wger/nutrition/views/unit.py+++ b/wger/nutrition/views/unit.py@@@ -53,10 -54,10 +53,10 @@@ logger = logging.getLogger(__name__# ************************-class WeightUnitListView(PermissionRequiredMixin, UAAwareViewMixin, ListView):+class WeightUnitListView(PermissionRequiredMixin, ListView):- '''+ """Generic view to list all weight units- '''+ """model = WeightUnittemplate_name = 'units/list.html'diff --cc wger/utils/generic_views.pyindex 6c0c02ab6,00f9bbbaa..310f6347f--- a/wger/utils/generic_views.py+++ b/wger/utils/generic_views.py@@@ -121,46 -120,51 +121,46 @@@ class WgerFormMixin(ModelFormMixin)form_action = ''form_action_urlname = ''+sidebar = ''- '''+ """Name of a template that will be included in the sidebar- '''+ """title = ''- '''+ """Title used in the form- '''+ """owner_object = False- '''+ """The object that holds the owner information. This only needs to be set ifthe model doesn't provide a get_owner_object() method- '''+ """submit_text = ugettext_lazy('Save')- '''+ """Text used in the submit button, default _('save')- '''+ """clean_html = ()- '''+ """List of form fields that should be passed to bleach to clean the html- '''+ """messages = ''- '''+ """- A message to display on sucess+ A message to display on success- '''+ """def get_context_data(self, **kwargs):- '''+ """- Set necessary template data to correctly render the form+ Set context data- '''+ """- # Call the base implementation first to get a contextcontext = super(WgerFormMixin, self).get_context_data(**kwargs)-- # CSRF token- context.update(csrf(self.request))-context['sidebar'] = self.sidebar- # TODO: change template so it iterates through form and not formfields- context['form_fields'] = context['form']+ context['title'] = self.title# Custom JS code on form (autocompleter, editor, etc.)context['custom_js'] = self.custom_js@@@ -203,28 -222,16 +203,28 @@@return super(WgerFormMixin, self).dispatch(request, *args, **kwargs)def get_messages(self):- '''+ """Getter for success message. Can be overwritten to e.g. to provide thename of the object.- '''+ """return self.messages+ def get_form(self, form_class=None):+ """Return an instance of the form to be used in this view."""+ form = super(WgerFormMixin, self).get_form(form_class)+ if not hasattr(form, "helper"):+ form.helper = FormHelper()+ form.helper.form_id = slugify(self.request.path)+ form.helper.form_method = 'post'+ form.helper.form_action = self.request.path+ form.helper.add_input(Submit('submit', self.submit_text, css_class='btn-success btn-block'))+ form.helper.form_class = 'wger-form'+ return form+def form_invalid(self, form):- '''+ """Log form errors to the console- '''+ """logger.debug(form.errors)return super(WgerFormMixin, self).form_invalid(form)@@@ -279,23 -297,8 +279,23 @@@ class WgerDeleteMixin(ModelFormMixin)return context+ def get_form(self, form_class=None):+ """Return an instance of the form to be used in this view."""+ form = super(WgerDeleteMixin, self).get_form(form_class)+ if not hasattr(form, "helper"):+ form.helper = FormHelper()+ form.helper.form_id = slugify(self.request.path)+ form.helper.form_method = 'post'+ form.helper.form_action = self.request.path+ form.helper.layout = Layout(+ ButtonHolder(+ Submit('submit', self.delete_message, css_class='btn-warning btn-block')+ )+ )+ return form+def dispatch(self, request, *args, **kwargs):- '''+ """Custom dispatch method.This basically only checks for ownerships of editable/deletablediff --cc wger/utils/resources.pyindex 000000000,663bb2d6e..e69de29bbmode 000000,100644..100644--- a/wger/utils/resources.py+++ b/wger/utils/resources.pydiff --cc wger/weight/api/resources.pyindex 000000000,c89af539e..e69de29bbmode 000000,100644..100644--- a/wger/weight/api/resources.py+++ b/wger/weight/api/resources.pydiff --cc wger/weight/views.pyindex 93a2384d8,f42bfc0f1..02de72128--- a/wger/weight/views.py+++ b/wger/weight/views.py@@@ -66,9 -68,10 +66,9 @@@ class WeightAddView(WgerFormMixin, Creamodel = WeightEntryform_class = WeightFormtitle = ugettext_lazy('Add weight entry')- form_action = reverse_lazy('weight:add')def get_initial(self):- '''+ """Set the initial data for the form.Read the comment on weight/models.py WeightEntry about why we need