Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Use render wrapper to replace django-mobile template loading

Scott Peshakb8b7f9108c51
diff --git a/wger/core/views/misc.py b/wger/core/views/misc.py
index 3cfca149d..f1f72ab18 100644
--- a/wger/core/views/misc.py
+++ b/wger/core/views/misc.py
@@ -29,7 +29,6 @@ from django.urls import (
reverse_lazy
)
from django.http import HttpResponseRedirect
-from django.shortcuts import render
from django.template.loader import render_to_string
from django.utils.translation import ugettext as _
from django.views.generic import TemplateView
@@ -49,6 +48,7 @@ from wger.manager.models import Schedule
from wger.nutrition.models import NutritionPlan
from wger.weight.helpers import get_last_entries
from wger.weight.models import WeightEntry
+from wger.utils.helpers import ua_aware_render
logger = logging.getLogger(__name__)
@@ -147,7 +147,7 @@ def dashboard(request):
# Load the nutritional info
template_data['nutritional_info'] = plan.get_nutritional_values()
- return render(request, 'index.html', template_data)
+ return ua_aware_render(request, 'index.html', template_data)
class ContactClassView(TemplateView):
diff --git a/wger/core/views/user.py b/wger/core/views/user.py
index 270466e3e..04bbc7eeb 100644
--- a/wger/core/views/user.py
+++ b/wger/core/views/user.py
@@ -37,10 +37,7 @@ from django.http import (
HttpResponseForbidden,
HttpResponseRedirect
)
-from django.shortcuts import (
- get_object_or_404,
- render
-)
+from django.shortcuts import get_object_or_404
from django.template.context_processors import csrf
from django.utils import translation
from django.utils.translation import (
@@ -87,6 +84,7 @@ from wger.utils.user_agents import (
check_request_android
)
from wger.weight.models import WeightEntry
+from wger.utils.helpers import ua_aware_render
logger = logging.getLogger(__name__)
@@ -152,7 +150,7 @@ def delete(request, user_pk=None):
'user_delete': user,
'form_action': form_action}
- return render(request, 'user/delete_account.html', context)
+ return ua_aware_render(request, 'user/delete_account.html', context)
@login_required()
@@ -284,7 +282,7 @@ def registration(request):
template_data['submit_text'] = _('Register')
template_data['extend_template'] = 'base.html'
- return render(request, 'form.html', template_data)
+ return ua_aware_render(request, 'form.html', template_data)
@login_required
@@ -328,7 +326,7 @@ def preferences(request):
messages.success(request, _('Settings successfully updated'))
return HttpResponseRedirect(reverse('core:user:preferences'))
else:
- return render(request, 'user/preferences.html', template_data)
+ return ua_aware_render(request, 'user/preferences.html', template_data)
class UserDeactivateView(LoginRequiredMixin,
@@ -465,7 +463,7 @@ def api_key(request):
context['token'] = token
- return render(request, 'user/api_key.html', context)
+ return ua_aware_render(request, 'user/api_key.html', context)
class UserDetailView(LoginRequiredMixin, WgerMultiplePermissionRequiredMixin, DetailView):
diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.py
index 78e11d576..235346a5f 100644
--- a/wger/exercises/views/exercises.py
+++ b/wger/exercises/views/exercises.py
@@ -42,10 +42,7 @@ from django.http import (
HttpResponseForbidden,
HttpResponseRedirect
)
-from django.shortcuts import (
- get_object_or_404,
- render
-)
+from django.shortcuts import get_object_or_404
from django.template.loader import render_to_string
from django.utils.translation import (
ugettext as _,
@@ -81,6 +78,8 @@ from wger.utils.widgets import (
TranslatedSelectMultiple
)
from wger.weight.helpers import process_log_entries
+from wger.utils.helpers import ua_aware_render
+from django_user_agents.utils import get_user_agent
logger = logging.getLogger(__name__)
@@ -169,7 +168,7 @@ def view(request, id, slug=None):
template_data['json'] = chart_data
template_data['svg_uuid'] = str(uuid.uuid4())
- return render(request, 'exercise/view.html', template_data)
+ return ua_aware_render(request, 'exercise/view.html', template_data)
class ExercisesEditAddView(WgerFormMixin):
diff --git a/wger/gym/views/gym.py b/wger/gym/views/gym.py
index 0cdea25c4..06a5d5a6b 100644
--- a/wger/gym/views/gym.py
+++ b/wger/gym/views/gym.py
@@ -39,10 +39,7 @@ from django.http.response import (
HttpResponseForbidden,
HttpResponseRedirect
)
-from django.shortcuts import (
- get_object_or_404,
- render
-)
+from django.shortcuts import get_object_or_404
from django.utils.translation import (
ugettext as _,
ugettext_lazy
@@ -74,7 +71,10 @@ from wger.utils.generic_views import (
WgerFormMixin,
WgerMultiplePermissionRequiredMixin
)
-from wger.utils.helpers import password_generator
+from wger.utils.helpers import (
+ password_generator,
+ ua_aware_render
+)
logger = logging.getLogger(__name__)
@@ -178,7 +178,7 @@ def gym_new_user_info(request):
context = {'new_user': get_object_or_404(User, pk=request.session['gym.user']['user_pk']),
'password': request.session['gym.user']['password']}
- return render(request, 'gym/new_user.html', context)
+ return ua_aware_render(request, 'gym/new_user.html', context)
@login_required
@@ -243,7 +243,7 @@ def reset_user_password(request, user_pk):
context = {'mod_user': user,
'password': password}
- return render(request, 'gym/reset_user_password.html', context)
+ return ua_aware_render(request, 'gym/reset_user_password.html', context)
def gym_permissions_user_edit(request, user_pk):
@@ -313,7 +313,7 @@ def gym_permissions_user_edit(request, user_pk):
context['extend_template'] = 'base_empty.html' if request.is_ajax() else 'base.html'
context['submit_text'] = 'Save'
- return render(request, 'form.html', context)
+ return ua_aware_render(request, 'form.html', context)
class GymAddUserView(WgerFormMixin,
diff --git a/wger/manager/views/day.py b/wger/manager/views/day.py
index d54eafe20..e941659ee 100644
--- a/wger/manager/views/day.py
+++ b/wger/manager/views/day.py
@@ -22,10 +22,7 @@ from django.contrib.auth.decorators import login_required
from django.contrib.auth.mixins import LoginRequiredMixin
from django.urls import reverse
from django.http import HttpResponseRedirect
-from django.shortcuts import (
- get_object_or_404,
- render
-)
+from django.shortcuts import get_object_or_404
from django.utils.translation import (
ugettext as _,
ugettext_lazy
@@ -43,6 +40,7 @@ from wger.manager.models import (
Workout
)
from wger.utils.generic_views import WgerFormMixin
+from wger.utils.helpers import ua_aware_render
logger = logging.getLogger(__name__)
@@ -150,4 +148,4 @@ def view(request, id):
template_data['day'] = day
- return render(request, 'day/view.html', template_data)
+ return ua_aware_render(request, 'day/view.html', template_data)
diff --git a/wger/manager/views/log.py b/wger/manager/views/log.py
index bc32dbb65..57b34cdf9 100644
--- a/wger/manager/views/log.py
+++ b/wger/manager/views/log.py
@@ -30,10 +30,7 @@ from django.http import (
HttpResponseForbidden,
HttpResponseRedirect
)
-from django.shortcuts import (
- get_object_or_404,
- render
-)
+from django.shortcuts import get_object_or_404
from django.template.context_processors import csrf
from django.utils.translation import (
ugettext as _,
@@ -52,6 +49,7 @@ from wger.manager.forms import (
WorkoutLogForm
)
from wger.manager.helpers import WorkoutCalendar
+from wger.utils.helpers import ua_aware_render
from wger.manager.models import (
Day,
Schedule,
@@ -234,7 +232,7 @@ def add(request, pk):
template_data['session_form'] = session_form
template_data['form_action'] = reverse('manager:day:log', kwargs={'pk': pk})
- return render(request, 'day/log.html', template_data)
+ return ua_aware_render(request, 'day/log.html', template_data)
class WorkoutLogDetailView(DetailView, LoginRequiredMixin):
@@ -332,7 +330,7 @@ def calendar(request, username=None, year=None, month=None):
context['impressions'] = WorkoutSession.IMPRESSION
context['month_list'] = WorkoutLog.objects.filter(user=user).dates('date', 'month')
context['show_shariff'] = is_owner and user.userprofile.ro_access
- return render(request, 'calendar/month.html', context)
+ return ua_aware_render(request, 'calendar/month.html', context)
def day(request, username, year, month, day):
@@ -353,4 +351,4 @@ def day(request, username, year, month, day):
context['is_owner'] = is_owner
context['show_shariff'] = is_owner and user.userprofile.ro_access
- return render(request, 'calendar/day.html', context)
+ return ua_aware_render(request, 'calendar/day.html', context)
diff --git a/wger/manager/views/schedule.py b/wger/manager/views/schedule.py
index b8a70c178..ccd1b5426 100644
--- a/wger/manager/views/schedule.py
+++ b/wger/manager/views/schedule.py
@@ -30,10 +30,7 @@ from django.http import (
HttpResponseForbidden,
HttpResponseRedirect
)
-from django.shortcuts import (
- get_object_or_404,
- render
-)
+from django.shortcuts import get_object_or_404
from django.utils.translation import (
ugettext as _,
ugettext_lazy
@@ -60,7 +57,8 @@ from wger.utils.generic_views import (
)
from wger.utils.helpers import (
check_token,
- make_token
+ make_token,
+ ua_aware_render
)
from wger.utils.pdf import (
render_footer,
@@ -81,7 +79,7 @@ def overview(request):
template_data['schedules'] = (Schedule.objects
.filter(user=request.user)
.order_by('-is_active', '-start_date'))
- return render(request, 'schedule/overview.html', template_data)
+ return ua_aware_render(request, 'schedule/overview.html', template_data)
def view(request, pk):
@@ -112,7 +110,7 @@ def view(request, pk):
template_data['owner_user'] = user
template_data['show_shariff'] = is_owner
- return render(request, 'schedule/view.html', template_data)
+ return ua_aware_render(request, 'schedule/view.html', template_data)
def export_pdf_log(request, pk, images=False, comments=False, uidb64=None, token=None):
diff --git a/wger/manager/views/set.py b/wger/manager/views/set.py
index 92de29ac4..2dc69737a 100644
--- a/wger/manager/views/set.py
+++ b/wger/manager/views/set.py
@@ -30,10 +30,7 @@ from django.http import (
HttpResponseForbidden,
HttpResponseRedirect
)
-from django.shortcuts import (
- get_object_or_404,
- render
-)
+from django.shortcuts import get_object_or_404
from django_user_agents.utils import get_user_agent
# wger
@@ -50,6 +47,7 @@ from wger.manager.models import (
Setting
)
from wger.utils.language import load_item_languages
+from wger.utils.helpers import ua_aware_render
logger = logging.getLogger(__name__)
@@ -141,7 +139,7 @@ def create(request, day_pk):
context['formsets'] = formsets
context['form_action'] = reverse('manager:set:add', kwargs={'day_pk': day_pk})
context['extend_template'] = 'base_empty.html' if request.is_ajax() else 'base.html'
- return render(request, 'set/add.html', context)
+ return ua_aware_render(request, 'set/add.html', context)
@login_required
@@ -158,7 +156,7 @@ def get_formset(request, exercise_pk, reps=Set.DEFAULT_SETS):
formset = SettingFormSet(queryset=Setting.objects.none(),
prefix='exercise{0}'.format(exercise_pk))
- return render(request,
+ return ua_aware_render(request,
"set/formset.html",
{'formset': formset,
'exercise': exercise})
@@ -238,4 +236,4 @@ def edit(request, pk):
context = {}
context['formsets'] = formsets
context['form_action'] = reverse('manager:set:edit', kwargs={'pk': pk})
- return render(request, 'set/edit.html', context)
+ return ua_aware_render(request, 'set/edit.html', context)
diff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.py
index 081dd1e23..162f0a195 100644
--- a/wger/manager/views/workout.py
+++ b/wger/manager/views/workout.py
@@ -30,10 +30,7 @@ from django.http import (
HttpResponseForbidden,
HttpResponseRedirect
)
-from django.shortcuts import (
- get_object_or_404,
- render
-)
+from django.shortcuts import get_object_or_404
from django.template.context_processors import csrf
from django.utils.translation import (
ugettext as _,
@@ -65,7 +62,10 @@ from wger.utils.generic_views import (
WgerDeleteMixin,
WgerFormMixin
)
-from wger.utils.helpers import make_token
+from wger.utils.helpers import (
+ make_token,
+ ua_aware_render
+)
logger = logging.getLogger(__name__)
@@ -87,7 +87,7 @@ def overview(request):
template_data['workouts'] = workouts
template_data['current_workout'] = current_workout
- return render(request, 'workout/overview.html', template_data)
+ return ua_aware_render(request, 'workout/overview.html', template_data)
def view(request, pk):
@@ -136,7 +136,7 @@ def view(request, pk):
template_data['owner_user'] = user
template_data['show_shariff'] = is_owner
- return render(request, 'workout/view.html', template_data)
+ return ua_aware_render(request, 'workout/view.html', template_data)
@login_required
@@ -218,7 +218,7 @@ def copy_workout(request, pk):
template_data['submit_text'] = _('Copy')
template_data['extend_template'] = 'base_empty.html' if request.is_ajax() else 'base.html'
- return render(request, 'form.html', template_data)
+ return ua_aware_render(request, 'form.html', template_data)
@login_required
@@ -405,4 +405,4 @@ def timer(request, day_pk):
context['form_action'] = url
context['weight_units'] = WeightUnit.objects.all()
context['repetition_units'] = RepetitionUnit.objects.all()
- return render(request, 'workout/timer.html', context)
+ return ua_aware_render(request, 'workout/timer.html', context)
diff --git a/wger/nutrition/views/bmi.py b/wger/nutrition/views/bmi.py
index 3a36c191f..ca7d2afc2 100644
--- a/wger/nutrition/views/bmi.py
+++ b/wger/nutrition/views/bmi.py
@@ -22,7 +22,6 @@ import logging
# Third Party
from django.contrib.auth.decorators import login_required
from django.http import HttpResponse
-from django.shortcuts import render
# wger
from wger.nutrition.forms import BmiForm
@@ -46,7 +45,7 @@ def view(request):
form_data = {'height': request.user.userprofile.height,
'weight': request.user.userprofile.weight}
context['form'] = BmiForm(initial=form_data)
- return render(request, 'bmi/form.html', context)
+ return helpers.ua_aware_render(request, 'bmi/form.html', context)
@login_required
diff --git a/wger/nutrition/views/calculator.py b/wger/nutrition/views/calculator.py
index 142768e8d..48f4b8e8d 100644
--- a/wger/nutrition/views/calculator.py
+++ b/wger/nutrition/views/calculator.py
@@ -22,7 +22,6 @@ import logging
# Third Party
from django.contrib.auth.decorators import login_required
from django.http import HttpResponse
-from django.shortcuts import render
# wger
from wger.nutrition.forms import (
@@ -30,6 +29,7 @@ from wger.nutrition.forms import (
DailyCaloriesForm,
PhysicalActivitiesForm
)
+from wger.utils.helpers import ua_aware_render
logger = logging.getLogger(__name__)
@@ -55,7 +55,7 @@ def view(request):
context['form_activities'] = PhysicalActivitiesForm(instance=request.user.userprofile)
context['form_calories'] = DailyCaloriesForm(instance=request.user.userprofile)
- return render(request, 'rate/form.html', context)
+ return ua_aware_render(request, 'rate/form.html', context)
@login_required
diff --git a/wger/nutrition/views/ingredient.py b/wger/nutrition/views/ingredient.py
index c641d4dda..f539634b9 100644
--- a/wger/nutrition/views/ingredient.py
+++ b/wger/nutrition/views/ingredient.py
@@ -33,10 +33,7 @@ from django.http import (
HttpResponseForbidden,
HttpResponseRedirect
)
-from django.shortcuts import (
- get_object_or_404,
- render
-)
+from django.shortcuts import get_object_or_404
from django.utils.translation import (
ugettext as _,
ugettext_lazy
@@ -61,6 +58,7 @@ from wger.utils.language import (
load_ingredient_languages,
load_language
)
+from wger.utils.helpers import ua_aware_render
logger = logging.getLogger(__name__)
@@ -112,7 +110,7 @@ def view(request, id, slug=None):
'unit': None})
template_data['show_shariff'] = True
- return render(request, 'ingredient/view.html', template_data)
+ return ua_aware_render(request, 'ingredient/view.html', template_data)
class IngredientDeleteView(WgerDeleteMixin,
diff --git a/wger/nutrition/views/plan.py b/wger/nutrition/views/plan.py
index 21622b82b..adc923de6 100644
--- a/wger/nutrition/views/plan.py
+++ b/wger/nutrition/views/plan.py
@@ -30,10 +30,7 @@ from django.http import (
HttpResponseForbidden,
HttpResponseRedirect
)
-from django.shortcuts import (
- get_object_or_404,
- render
-)
+from django.shortcuts import get_object_or_404
from django.template.context_processors import csrf
from django.utils.translation import (
ugettext as _,
@@ -66,7 +63,8 @@ from wger.utils.generic_views import (
)
from wger.utils.helpers import (
check_token,
- make_token
+ make_token,
+ ua_aware_render
)
from wger.utils.language import load_language
from wger.utils.pdf import styleSheet
@@ -88,7 +86,7 @@ def overview(request):
plans = NutritionPlan.objects.filter(user=request.user)
template_data['plans'] = plans
- return render(request, 'plan/overview.html', template_data)
+ return ua_aware_render(request, 'plan/overview.html', template_data)
@login_required
@@ -179,7 +177,7 @@ def view(request, id):
template_data['is_owner'] = is_owner
template_data['show_shariff'] = is_owner
- return render(request, 'plan/view.html', template_data)
+ return ua_aware_render(request, 'plan/view.html', template_data)
@login_required
diff --git a/wger/software/views.py b/wger/software/views.py
index a29ef7591..d89365909 100644
--- a/wger/software/views.py
+++ b/wger/software/views.py
@@ -19,7 +19,7 @@ import logging
# Third Party
from django.conf import settings
-from django.shortcuts import render
+from wger.utils.helpers import ua_aware_render
logger = logging.getLogger(__name__)
@@ -32,4 +32,4 @@ def features(request):
context = {'allow_registration': settings.WGER_SETTINGS['ALLOW_REGISTRATION'],
'allow_guest_users': settings.WGER_SETTINGS['ALLOW_GUEST_USERS']}
- return render(request, 'features.html', context)
+ return ua_aware_render(request, 'features.html', context)
diff --git a/wger/weight/views.py b/wger/weight/views.py
index 4f6e87e63..0b5e64011 100644
--- a/wger/weight/views.py
+++ b/wger/weight/views.py
@@ -33,7 +33,6 @@ from django.http import (
HttpResponse,
HttpResponseRedirect
)
-from django.shortcuts import render
from django.utils.translation import (
ugettext as _,
ugettext_lazy
@@ -48,7 +47,10 @@ from rest_framework.response import Response
# wger
from wger.utils.generic_views import WgerFormMixin
-from wger.utils.helpers import check_access
+from wger.utils.helpers import (
+ check_access,
+ ua_aware_render
+)
from wger.weight import helpers
from wger.weight.forms import WeightForm
from wger.weight.models import WeightEntry
@@ -168,7 +170,7 @@ def overview(request, username=None):
template_data['owner_user'] = user
template_data['show_shariff'] = is_owner
template_data['last_five_weight_entries_details'] = last_weight_entries
- return render(request, 'overview.html', template_data)
+ return ua_aware_render(request, 'overview.html', template_data)
@api_view(['GET'])