diff --git a/src/postorius/utils.py b/src/postorius/utils.py index 00f7c00..14ef1b9 100644 --- a/src/postorius/utils.py +++ b/src/postorius/utils.py @@ -19,7 +19,7 @@ from django.conf import settings from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger -from django.shortcuts import render_to_response +from django.shortcuts import render from django.template import RequestContext from mailmanclient import Client from django.utils.translation import gettext as _ @@ -38,10 +38,8 @@ """Renders an error template. Use if MailmanApiError is catched. """ - return render_to_response( - 'postorius/errors/generic.html', - {'error': _('Mailman REST API not available. Please start Mailman core.')}, - context_instance=RequestContext(request)) + return render(request, 'postorius/errors/generic.html', + {'error': _('Mailman REST API not available. Please start Mailman core.')}) diff --git a/src/postorius/views/domain.py b/src/postorius/views/domain.py index 17f0b3b..02a2b90 100644 --- a/src/postorius/views/domain.py +++ b/src/postorius/views/domain.py @@ -20,7 +20,7 @@ from django.contrib import messages from django.contrib.auth.decorators import login_required, user_passes_test from django.core.urlresolvers import reverse -from django.shortcuts import render_to_response, redirect +from django.shortcuts import render, redirect from django.template import RequestContext from django.utils.translation import gettext as _ try: @@ -39,9 +39,7 @@ existing_domains = Domain.objects.all() except MailmanApiError: return utils.render_api_error(request) - return render_to_response('postorius/domain/index.html', - {'domains': existing_domains}, - context_instance=RequestContext(request)) + return render(request, 'postorius/domain/index.html', {'domains': existing_domains}) @login_required @@ -66,9 +64,7 @@ return redirect("domain_index") else: form = DomainNew() - return render_to_response('postorius/domain/new.html', - {'form': form, 'message': message}, - context_instance=RequestContext(request)) + return render(request, 'postorius/domain/new.html', {'form': form, 'message': message}) def domain_delete(request, domain): @@ -87,6 +83,5 @@ return redirect("domain_index") submit_url = reverse('domain_delete', kwargs={'domain': domain}) - return render_to_response('postorius/domain/confirm_delete.html', - {'domain': domain, 'submit_url': submit_url}, - context_instance=RequestContext(request)) + return render(request, 'postorius/domain/confirm_delete.html', + {'domain': domain, 'submit_url': submit_url}) diff --git a/src/postorius/views/list.py b/src/postorius/views/list.py index 2e6b3ca..fcce731 100644 --- a/src/postorius/views/list.py +++ b/src/postorius/views/list.py @@ -24,7 +24,7 @@ from django.contrib.auth.decorators import (login_required, user_passes_test) from django.core.urlresolvers import reverse -from django.shortcuts import render, render_to_response, redirect +from django.shortcuts import render, redirect from django.template import RequestContext from django.core.exceptions import ValidationError from django.utils.decorators import method_decorator @@ -192,9 +192,8 @@ data['subscribe_form'] = ListSubscribe(user_emails) else: user_emails = None - return render_to_response( - 'postorius/lists/summary.html', data, - context_instance=RequestContext(request)) + data['change_subscription_form'] = None + return render(request, 'postorius/lists/summary.html', data) class ChangeSubscriptionView(MailingListView): @@ -456,15 +455,12 @@ list_id=mailing_list.list_id) # TODO catch correct Error class: except HTTPError as e: - return render_to_response( - 'postorius/errors/generic.html', - {'error': e}, context_instance=RequestContext(request)) + return render(request, 'postorius/errors/generic.html', {'error': e}) else: choosable_domains = _get_choosable_domains(request) form = ListNew(choosable_domains, initial={'list_owner': request.user.email}) - return render_to_response(template, {'form': form}, - context_instance=RequestContext(request)) + return render(request, template, {'form': form}) def list_index(request, template='postorius/index.html'): @@ -484,15 +480,10 @@ except MailmanApiError: return utils.render_api_error(request) choosable_domains = _get_choosable_domains(request) - return render_to_response( - template, { - 'count_options': [10, 25, 50, 100, 200], - 'error': error, - 'lists': utils.paginate(request, - lists, - count=request.GET.get('count', 10)), - 'domain_count': len(choosable_domains), - }, context_instance=RequestContext(request)) + return render(request, template, + {'count_options': [10, 25, 50, 100, 200], 'error': error, + 'lists': utils.paginate(request, lists, count=request.GET.get('count', 10)), + 'domain_count': len(choosable_domains)}) @login_required @@ -511,11 +502,8 @@ submit_url = reverse('list_delete', kwargs={'list_id': list_id}) cancel_url = reverse('list_index',) - return render_to_response( - 'postorius/lists/confirm_delete.html', - {'submit_url': submit_url, 'cancel_url': cancel_url, - 'list': the_list}, - context_instance=RequestContext(request)) + return render(request, 'postorius/lists/confirm_delete.html', + {'submit_url': submit_url, 'cancel_url': cancel_url, 'list': the_list}) @login_required @@ -595,9 +583,7 @@ m_list = List.objects.get_or_404(fqdn_listname=list_id) except MailmanApiError: return utils.render_api_error(request) - return render_to_response('postorius/lists/subscription_requests.html', - {'list': m_list}, - context_instance=RequestContext(request)) + return render(request, 'postorius/lists/subscription_requests.html',{'list': m_list}) @login_required @@ -699,7 +685,6 @@ 'visible_section': visible_section, }) - @login_required @list_owner_required def remove_role(request, list_id=None, role=None, address=None, @@ -744,10 +729,8 @@ messages.success(request, _('The user %(address)s has been removed from the %(role)s group.') % {'address': address, 'role': role}) return redirect_on_success - return render_to_response(template, - {'role': role, 'address': address, - 'list_id': the_list.list_id}, - context_instance=RequestContext(request)) + return render(request, template, + {'role': role, 'address': address, 'list_id': the_list.list_id}) @login_required @@ -769,9 +752,8 @@ return redirect('list_members', mlist.list_id) except Exception as e: messages.error(request, e) - return render_to_response('postorius/lists/confirm_removeall_subscribers.html', - {'list': mlist}, - context_instance=RequestContext(request)) + return render(request, 'postorius/lists/confirm_removeall_subscribers.html', + {'list': mlist}) except MailmanApiError: return utils.render_api_error(request) diff --git a/src/postorius/views/user.py b/src/postorius/views/user.py index 0d2d093..6fcad66 100644 --- a/src/postorius/views/user.py +++ b/src/postorius/views/user.py @@ -20,7 +20,7 @@ from django.forms.formsets import formset_factory from django.contrib import messages from django.contrib.auth.decorators import (login_required,user_passes_test) -from django.shortcuts import render_to_response, redirect +from django.shortcuts import redirect, render from django.template import RequestContext from django.utils.decorators import method_decorator from django.utils.translation import gettext as _ @@ -70,10 +70,8 @@ except MailmanApiError: return utils.render_api_error(request) settingsform = UserPreferences(initial=mm_user.preferences) - return render_to_response('postorius/user/mailman_settings.html', - {'mm_user': mm_user, - 'settingsform': settingsform}, - context_instance=RequestContext(request)) + return render(request, 'postorius/user/mailman_settings.html', + {'mm_user': mm_user, 'settingsform': settingsform}) class UserAddressPreferencesView(MailmanUserView): @@ -114,17 +112,10 @@ except MailmanApiError: return utils.render_api_error(request) except Mailman404Error: - return render_to_response( - 'postorius/user/address_preferences.html', - {'nolists': 'true'}, - context_instance=RequestContext(request)) - return render_to_response('postorius/user/address_preferences.html', - {'mm_user': mm_user, - 'addresses': addresses, - 'helperform': helperform, - 'formset': formset, - 'zipped_data': zipped_data}, - context_instance=RequestContext(request)) + return render(request, 'postorius/user/address_preferences.html', {'nolists': 'true'}) + return render(request, 'postorius/user/address_preferences.html', + {'mm_user': mm_user, 'addresses': addresses, 'helperform': helperform, + 'formset': formset, 'zipped_data': zipped_data}) @login_required @@ -194,15 +185,10 @@ except MailmanApiError: return utils.render_api_error(request) except Mailman404Error: - return render_to_response( - 'postorius/user/subscription_preferences.html', - {'nolists': 'true'}, - context_instance=RequestContext(request)) - return render_to_response( - 'postorius/user/subscription_preferences.html', - {'zipped_data': zipped_data, - 'formset': formset}, - context_instance=RequestContext(request)) + return render(request, 'postorius/user/subscription_preferences.html', + {'nolists': 'true'}) + return render(request, 'postorius/user/subscription_preferences.html', + {'zipped_data': zipped_data, 'formset': formset}) class UserSubscriptionsView(MailmanUserView): @@ -212,9 +198,7 @@ @method_decorator(login_required) def get(self, request): memberships = self._get_memberships() - return render_to_response('postorius/user/subscriptions.html', - {'memberships': memberships}, - context_instance=RequestContext(request)) + return render(request, 'postorius/user/subscriptions.html', {'memberships': memberships}) class AddressActivationView(TemplateView): @@ -226,9 +210,7 @@ @method_decorator(login_required) def get(self, request): form = AddressActivationForm(initial={'user_email': request.user.email}) - return render_to_response('postorius/user/address_activation.html', - {'form': form}, - context_instance=RequestContext(request)) + return render(request, 'postorius/user/address_activation.html', {'form': form}) @method_decorator(login_required) def post(self, request): @@ -241,11 +223,8 @@ except SMTPException: messages.error(request, _('The email confirmation message could not be sent. %s') % profile.activation_key) - return render_to_response('postorius/user/address_activation_sent.html', - context_instance=RequestContext(request)) - return render_to_response('postorius/user/address_activation.html', - {'form': form}, - context_instance=RequestContext(request)) + return render(request, 'postorius/user/address_activation_sent.html') + return render(request, 'postorius/user/address_activation.html', {'form': form}) @login_required() @@ -255,9 +234,7 @@ mm_user = MailmanUser.objects.get_or_create_from_django(request.user) except MailmanApiError: return utils.render_api_error(request) - return render_to_response('postorius/user/profile.html', - {'mm_user': mm_user}, - context_instance=RequestContext(request)) + return render(request, 'postorius/user/profile.html', {'mm_user': mm_user}) def _add_address(request, user_email, address):