Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Replace all occurences of render_to_response() with render()

Roland Geiderd4efd81dca27
diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.py
index bce276167..febbe3725 100644
--- a/wger/exercises/views/exercises.py
+++ b/wger/exercises/views/exercises.py
@@ -17,8 +17,7 @@ import logging
import json
import uuid
-from django.template import RequestContext
-from django.shortcuts import render_to_response
+from django.shortcuts import render
from django.shortcuts import get_object_or_404
from django.http import HttpResponse
from django.http import HttpResponseRedirect
@@ -38,7 +37,6 @@ from django.views.generic import ListView
from django.views.generic import DeleteView
from django.views.generic import CreateView
from django.views.generic import UpdateView
-
from easy_thumbnails.files import get_thumbnailer
from easy_thumbnails.alias import aliases
@@ -141,9 +139,7 @@ def view(request, id, slug=None):
template_data['reps'] = _("Reps")
# Render
- return render_to_response('exercise/view.html',
- template_data,
- context_instance=RequestContext(request))
+ return render(request, 'exercise/view.html', template_data)
class ExercisesEditAddView(WgerFormMixin):
diff --git a/wger/manager/views/day.py b/wger/manager/views/day.py
index 659395ff1..3a6813523 100644
--- a/wger/manager/views/day.py
+++ b/wger/manager/views/day.py
@@ -16,25 +16,20 @@
import logging
-from django.template import RequestContext
-from django.shortcuts import render_to_response
+from django.shortcuts import render
from django.shortcuts import get_object_or_404
from django.http import HttpResponseRedirect
from django.http import HttpResponseForbidden
from django.core.urlresolvers import reverse
from django.utils.translation import ugettext_lazy
-
from django.contrib.auth.decorators import login_required
-
from django.views.generic import CreateView
from django.views.generic import UpdateView
from wger.manager.models import DaysOfWeek
from wger.manager.models import Workout
from wger.manager.models import Day
-
from wger.manager.forms import DayForm
-
from wger.utils.generic_views import WgerFormMixin
@@ -141,6 +136,4 @@ def view(request, id):
template_data['day'] = day
- return render_to_response('day/view.html',
- template_data,
- context_instance=RequestContext(request))
+ return render(request, 'day/view.html', template_data)
diff --git a/wger/manager/views/log.py b/wger/manager/views/log.py
index 5c365dce3..6d02f1541 100644
--- a/wger/manager/views/log.py
+++ b/wger/manager/views/log.py
@@ -20,8 +20,7 @@ import datetime
from calendar import HTMLCalendar
from itertools import groupby
-from django.template import RequestContext
-from django.shortcuts import render_to_response
+from django.shortcuts import render
from django.shortcuts import get_object_or_404
from django.http import HttpResponseRedirect
from django.http import HttpResponseForbidden
@@ -29,7 +28,6 @@ from django.core.context_processors import csrf
from django.core.urlresolvers import reverse
from django.utils.translation import ugettext as _
from django.forms.models import modelformset_factory
-
from django.views.generic import UpdateView
from django.views.generic import CreateView
from django.views.generic import DetailView
@@ -39,11 +37,9 @@ from wger.manager.models import WorkoutSession
from wger.manager.models import Day
from wger.manager.models import WorkoutLog
from wger.manager.models import Schedule
-
from wger.manager.forms import HelperDateForm
from wger.manager.forms import HelperWorkoutSessionForm
from wger.manager.forms import WorkoutLogForm
-
from wger.utils.generic_views import WgerFormMixin
from wger.utils.generic_views import WgerPermissionMixin
from wger.weight.helpers import process_log_entries
@@ -237,9 +233,7 @@ def add(request, pk):
template_data['session_form'] = session_form
template_data['form_action'] = reverse('day-log', kwargs={'pk': pk})
- return render_to_response('day/log.html',
- template_data,
- context_instance=RequestContext(request))
+ return render(request, 'day/log.html', template_data)
class WorkoutLogDetailView(DetailView, WgerPermissionMixin):
@@ -383,6 +377,4 @@ def calendar(request, year=None, month=None):
context['current_month'] = month
context['current_workout'] = current_workout
context['month_list'] = WorkoutLog.objects.filter(user=request.user).dates('date', 'month')
- return render_to_response('workout/calendar.html',
- context,
- context_instance=RequestContext(request))
+ return render(request, 'workout/calendar.html', context)
diff --git a/wger/manager/views/misc.py b/wger/manager/views/misc.py
index 0803a3fe2..4495eb973 100644
--- a/wger/manager/views/misc.py
+++ b/wger/manager/views/misc.py
@@ -16,9 +16,7 @@
import logging
-
-from django.template import RequestContext
-from django.shortcuts import render_to_response
+from django.shortcuts import render
from django.http import HttpResponseRedirect
from django.core.exceptions import ObjectDoesNotExist
from django.core.urlresolvers import reverse
@@ -27,7 +25,6 @@ from django.core import mail
from django.utils.translation import ugettext as _
from django.views.generic.edit import FormView
from django.views.generic import TemplateView
-
from django.contrib import messages
from django.contrib.auth.decorators import login_required
from django.contrib.auth import login as django_login
@@ -35,12 +32,9 @@ from django.contrib.auth import login as django_login
from wger.manager import forms
from wger.manager.demo import create_demo_entries
from wger.manager.demo import create_temporary_user
-
from wger.manager.models import DaysOfWeek
from wger.manager.models import Schedule
-
from wger.nutrition.models import NutritionPlan
-
from wger.weight.models import WeightEntry
@@ -136,9 +130,7 @@ def dashboard(request):
# Load the nutritional info
template_data['nutritional_info'] = plan.get_nutritional_values()
- return render_to_response('index.html',
- template_data,
- context_instance=RequestContext(request))
+ return render(request, 'index.html', template_data)
class ContactClassView(TemplateView):
diff --git a/wger/manager/views/schedule.py b/wger/manager/views/schedule.py
index dde243646..3632f01b3 100644
--- a/wger/manager/views/schedule.py
+++ b/wger/manager/views/schedule.py
@@ -16,23 +16,19 @@
import logging
-from django.template import RequestContext
-from django.shortcuts import render_to_response
+from django.shortcuts import render
from django.shortcuts import get_object_or_404
from django.http import HttpResponse
from django.core.urlresolvers import reverse_lazy
from django.utils.translation import ugettext as _
from django.utils.translation import ugettext_lazy
-
from django.contrib.auth.decorators import login_required
-
from django.views.generic import CreateView
from django.views.generic import DeleteView
from django.views.generic import UpdateView
from wger.manager.models import Schedule
from wger.manager.models import ScheduleStep
-
from wger.utils.generic_views import WgerFormMixin
from wger.utils.generic_views import WgerDeleteMixin
from wger.utils.generic_views import WgerPermissionMixin
@@ -51,9 +47,7 @@ def overview(request):
template_data['schedules'] = (Schedule.objects
.filter(user=request.user)
.order_by('-is_active', '-start_date'))
- return render_to_response('schedule/overview.html',
- template_data,
- context_instance=RequestContext(request))
+ return render(request, 'schedule/overview.html', template_data)
@login_required
@@ -72,9 +66,7 @@ def view(request, pk):
schedule.get_current_scheduled_workout()
- return render_to_response('schedule/view.html',
- template_data,
- context_instance=RequestContext(request))
+ return render(request, 'schedule/view.html', template_data)
class ScheduleCreateView(WgerFormMixin, CreateView, WgerPermissionMixin):
diff --git a/wger/manager/views/set.py b/wger/manager/views/set.py
index 802acd05c..82c53cc5f 100644
--- a/wger/manager/views/set.py
+++ b/wger/manager/views/set.py
@@ -18,8 +18,7 @@ import logging
from django.forms.models import modelformset_factory
from django.forms.models import inlineformset_factory
-from django.template import RequestContext
-from django.shortcuts import render_to_response
+from django.shortcuts import render
from django.shortcuts import get_object_or_404
from django.http import HttpResponse
from django.http import HttpResponseRedirect
@@ -27,16 +26,12 @@ from django.http import HttpResponseForbidden
from django.core.urlresolvers import reverse
from django.utils.translation import ugettext as _
from django.db import models
-
from django.contrib.auth.decorators import login_required
-
from wger.manager.models import Day
from wger.manager.models import Set
from wger.manager.models import Setting
-
from wger.exercises.models import Exercise
-
from wger.manager.forms import SetForm, SetFormMobile
from wger.utils.language import load_item_languages
from wger.config.models import LanguageConfig
@@ -124,9 +119,7 @@ def create(request, day_pk):
context['max_sets'] = Set.MAX_SETS
context['formsets'] = formsets
context['form_action'] = reverse('set-add', kwargs={'day_pk': day_pk})
- return render_to_response('set/add.html',
- context,
- context_instance=RequestContext(request))
+ return render(request, 'set/add.html', context)
@login_required
@@ -143,10 +136,10 @@ def get_formset(request, exercise_pk, reps=Set.DEFAULT_SETS):
formset = SettingFormSet(queryset=Setting.objects.none(),
prefix='exercise{0}'.format(exercise_pk))
- return render_to_response("set/formset.html",
- {'formset': formset,
- 'exercise': exercise},
- context_instance=RequestContext(request))
+ return render(request,
+ "set/formset.html",
+ {'formset': formset,
+ 'exercise': exercise})
@login_required
@@ -222,9 +215,7 @@ def edit(request, pk):
context = {}
context['formsets'] = formsets
context['form_action'] = reverse('set-edit', kwargs={'pk': pk})
- return render_to_response('set/edit.html',
- context,
- context_instance=RequestContext(request))
+ return render(request, 'set/edit.html', context)
@login_required
diff --git a/wger/manager/views/user.py b/wger/manager/views/user.py
index 084345d20..c93ee0e55 100644
--- a/wger/manager/views/user.py
+++ b/wger/manager/views/user.py
@@ -16,15 +16,13 @@
import logging
-from django.template import RequestContext
-from django.shortcuts import render_to_response
+from django.shortcuts import render
from django.http import HttpResponse
from django.http import HttpResponseRedirect
from django.core.context_processors import csrf
from django.core.urlresolvers import reverse
from django.utils.translation import ugettext as _
from django.utils import translation
-
from django.contrib.auth import authenticate
from django.contrib.auth import login as django_login
from django.contrib.auth import logout as django_logout
@@ -32,7 +30,6 @@ from django.contrib.auth.decorators import login_required
from django.contrib.auth.models import User as Django_User
from django.contrib.auth.views import login as django_loginview
from django.contrib import messages
-
from tastypie.models import ApiKey
from wger.exercises.models import Language
@@ -115,9 +112,7 @@ def registration(request):
template_data['form_action'] = reverse('registration')
template_data['submit_text'] = _('Register')
- return render_to_response('form.html',
- template_data,
- context_instance=RequestContext(request))
+ return render(request, 'form.html', template_data)
@login_required
@@ -165,9 +160,7 @@ def preferences(request):
messages.success(request, _('Settings successfully updated'))
return HttpResponseRedirect(reverse('preferences'))
else:
- return render_to_response('user/preferences.html',
- template_data,
- context_instance=RequestContext(request))
+ return render(request, 'user/preferences.html', template_data)
@login_required
@@ -225,6 +218,4 @@ def api_key(request):
context['key'] = key
- return render_to_response('user/api_key.html',
- context,
- context_instance=RequestContext(request))
+ return render(request, 'user/api_key.html', context)
diff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.py
index 7659b8da1..e89983f36 100644
--- a/wger/manager/views/workout.py
+++ b/wger/manager/views/workout.py
@@ -18,8 +18,7 @@ import logging
import uuid
import datetime
-from django.template import RequestContext
-from django.shortcuts import render_to_response, render
+from django.shortcuts import render
from django.shortcuts import get_object_or_404
from django.http import HttpResponseRedirect
from django.core.context_processors import csrf
@@ -27,9 +26,7 @@ from django.core.urlresolvers import reverse
from django.core.urlresolvers import reverse_lazy
from django.utils.translation import ugettext as _
from django.utils.translation import ugettext_lazy
-
from django.contrib.auth.decorators import login_required
-
from django.views.generic import DeleteView
from django.views.generic import UpdateView
@@ -41,11 +38,11 @@ from wger.manager.models import Day
from wger.manager.forms import WorkoutForm
from wger.manager.forms import WorkoutSessionHiddenFieldsForm
from wger.manager.forms import WorkoutCopyForm
-
from wger.utils.generic_views import WgerFormMixin
from wger.utils.generic_views import WgerDeleteMixin
from wger.utils.generic_views import WgerPermissionMixin
+
logger = logging.getLogger('wger.custom')
@@ -65,9 +62,7 @@ def overview(request):
template_data['workouts'] = latest_workouts
template_data['current_workout'] = current_workout
- return render_to_response('workout/overview.html',
- template_data,
- context_instance=RequestContext(request))
+ return render(request, 'workout/overview.html', template_data)
@login_required
@@ -98,9 +93,7 @@ def view(request, id):
template_data['muscle_backgrounds_front'] = muscles_front
template_data['muscle_backgrounds_back'] = muscles_back
- return render_to_response('workout/view.html',
- template_data,
- context_instance=RequestContext(request))
+ return render(request, 'workout/view.html', template_data)
@login_required
@@ -175,9 +168,7 @@ def copy_workout(request, pk):
template_data['form_fields'] = [workout_form['comment']]
template_data['submit_text'] = _('Copy')
- return render_to_response('form.html',
- template_data,
- context_instance=RequestContext(request))
+ return render(request, 'form.html', template_data)
@login_required
diff --git a/wger/nutrition/views/bmi.py b/wger/nutrition/views/bmi.py
index c96dea3fc..64953a15d 100644
--- a/wger/nutrition/views/bmi.py
+++ b/wger/nutrition/views/bmi.py
@@ -18,13 +18,13 @@
import logging
import json
-from django.template import RequestContext
from django.http import HttpResponse
-from django.shortcuts import render_to_response
+from django.shortcuts import render
from wger.nutrition.forms import BmiForm
from wger.utils import helpers
+
logger = logging.getLogger('wger.custom')
'''
@@ -41,9 +41,7 @@ def view(request):
form_data = {'height': request.user.userprofile.height,
'weight': request.user.userprofile.weight}
context['form'] = BmiForm(initial=form_data)
- return render_to_response('bmi/form.html',
- context,
- context_instance=RequestContext(request))
+ return render(request, 'bmi/form.html', context)
def calculate(request):
diff --git a/wger/nutrition/views/calculator.py b/wger/nutrition/views/calculator.py
index f5b42f82e..3b7c9f8ed 100644
--- a/wger/nutrition/views/calculator.py
+++ b/wger/nutrition/views/calculator.py
@@ -18,9 +18,8 @@
import logging
import json
-from django.template import RequestContext
from django.http import HttpResponse
-from django.shortcuts import render_to_response
+from django.shortcuts import render
from wger.nutrition.forms import BmrForm
from wger.nutrition.forms import PhysicalActivitiesForm
@@ -49,9 +48,7 @@ def view(request):
context['form_activities'] = PhysicalActivitiesForm(instance=request.user.userprofile)
context['form_calories'] = DailyCaloriesForm(instance=request.user.userprofile)
- return render_to_response('rate/form.html',
- context,
- context_instance=RequestContext(request))
+ return render(request, 'rate/form.html', context)
def calculate_bmr(request):
diff --git a/wger/nutrition/views/ingredient.py b/wger/nutrition/views/ingredient.py
index 842a6fc52..3c59ea053 100644
--- a/wger/nutrition/views/ingredient.py
+++ b/wger/nutrition/views/ingredient.py
@@ -16,8 +16,7 @@
import logging
import json
-from django.template import RequestContext
-from django.shortcuts import render_to_response
+from django.shortcuts import render
from django.shortcuts import get_object_or_404
from django.http import HttpResponse
from django.http import HttpResponseRedirect
@@ -32,7 +31,6 @@ from django.contrib.auth.decorators import login_required
from django.contrib import messages
from django.utils.translation import ugettext as _
from django.utils.translation import ugettext_lazy
-
from django.views.generic import DeleteView
from django.views.generic import CreateView
from django.views.generic import UpdateView
@@ -42,7 +40,6 @@ from wger.nutrition.forms import UnitChooserForm
from wger.nutrition.models import MealItem
from wger.nutrition.models import Ingredient
from wger.nutrition.models import IngredientWeightUnit
-
from wger.utils import helpers
from wger.utils.generic_views import WgerPermissionMixin
from wger.utils.generic_views import WgerFormMixin
@@ -52,6 +49,7 @@ from wger.utils.language import load_language
from wger.utils.language import load_ingredient_languages
from wger.utils.cache import cache_mapper
+
logger = logging.getLogger('wger.custom')
@@ -92,9 +90,7 @@ def view(request, id, slug=None):
'amount': 100,
'unit': None})
- return render_to_response('ingredient/view.html',
- template_data,
- context_instance=RequestContext(request))
+ return render(request, 'ingredient/view.html', template_data)
class IngredientDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
@@ -248,9 +244,7 @@ def search(request):
template_data.update(csrf(request))
template_data['ingredients'] = ingredients
template_data['search_term'] = q
- return render_to_response('ingredient/search.html',
- template_data,
- context_instance=RequestContext(request))
+ return render(request, 'ingredient/search.html', template_data)
@login_required
diff --git a/wger/nutrition/views/plan.py b/wger/nutrition/views/plan.py
index 49e956401..5ed0900a0 100644
--- a/wger/nutrition/views/plan.py
+++ b/wger/nutrition/views/plan.py
@@ -16,8 +16,7 @@
import logging
import datetime
-from django.template import RequestContext
-from django.shortcuts import render_to_response
+from django.shortcuts import render
from django.shortcuts import get_object_or_404
from django.http import HttpResponse
from django.http import HttpResponseRedirect
@@ -27,18 +26,15 @@ from django.core.urlresolvers import reverse_lazy
from django.contrib.auth.decorators import login_required
from django.utils.translation import ugettext as _
from django.utils.translation import ugettext_lazy
-
from django.views.generic import DeleteView
from django.views.generic import UpdateView
-
-from wger.nutrition.models import NutritionPlan
-from wger.nutrition.models import MEALITEM_WEIGHT_GRAM
-from wger.nutrition.models import MEALITEM_WEIGHT_UNIT
-
from reportlab.lib.pagesizes import A4, cm
from reportlab.platypus import Paragraph, SimpleDocTemplate, Table
from reportlab.lib import colors
+from wger.nutrition.models import NutritionPlan
+from wger.nutrition.models import MEALITEM_WEIGHT_GRAM
+from wger.nutrition.models import MEALITEM_WEIGHT_UNIT
from wger import get_version
from wger.utils.generic_views import WgerFormMixin
from wger.utils.generic_views import WgerDeleteMixin
@@ -62,9 +58,7 @@ def overview(request):
plans = NutritionPlan.objects.filter(user=request.user)
template_data['plans'] = plans
- return render_to_response('plan/overview.html',
- template_data,
- context_instance=RequestContext(request))
+ return render(request, 'plan/overview.html', template_data)
@login_required
@@ -122,9 +116,7 @@ def view(request, id):
# Get the nutritional info
template_data['nutritional_data'] = plan.get_nutritional_values()
- return render_to_response('plan/view.html',
- template_data,
- context_instance=RequestContext(request))
+ return render(request, 'plan/view.html', template_data)
@login_required
diff --git a/wger/weight/views.py b/wger/weight/views.py
index 03d1b02f1..2e19aefb3 100644
--- a/wger/weight/views.py
+++ b/wger/weight/views.py
@@ -19,9 +19,7 @@ import csv
import json
import datetime
-
-from django.template import RequestContext
-from django.shortcuts import render_to_response
+from django.shortcuts import render
from django.http import HttpResponse
from django.http import HttpResponseRedirect
from django.forms import ModelForm
@@ -38,17 +36,15 @@ from django.utils.translation import ugettext as _
from django.utils.translation import ugettext_lazy
from django.db.models import Min
from django.db.models import Max
-
from django.views.generic import CreateView
from django.views.generic import UpdateView
+from django.forms import widgets
from wger.weight.models import WeightEntry
from wger.weight import helpers
-
from wger.utils.generic_views import WgerFormMixin
from wger.utils.constants import DATE_FORMATS
from wger.utils.widgets import Html5DateInput
-from django.forms import widgets
logger = logging.getLogger('wger.custom')
@@ -164,9 +160,7 @@ def overview(request):
{'year': max_date.year,
'month': max_date.month,
'day': max_date.day}
- return render_to_response('weight_overview.html',
- template_data,
- context_instance=RequestContext(request))
+ return render(request, 'weight_overview.html', template_data)
@login_required