From 40173474489b9bd7b126eaf6dc1a29ad88562de0 Mon Sep 17 00:00:00 2001 From: Dmitry Novikov Date: Thu, 23 Aug 2018 23:52:59 +0300 Subject: [PATCH] fix render func --- .gitignore | 1 - abonapp/views.py | 18 +++++++++--------- clientsideapp/views.py | 4 ++-- devapp/views.py | 8 ++++---- dialing.py | 2 +- dialing_app/views.py | 4 ++-- mapapp/views.py | 15 +++++++-------- msg_app/views.py | 4 ++-- 8 files changed, 27 insertions(+), 29 deletions(-) diff --git a/.gitignore b/.gitignore index c296d34..21e4a48 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,6 @@ media/min/* ~*/migrations/00*.py .idea/ djing/local_settings.py -agent/settings.py gmap/fixtures *.sqlite3 *.json diff --git a/abonapp/views.py b/abonapp/views.py index 9c31bcb..05e6370 100644 --- a/abonapp/views.py +++ b/abonapp/views.py @@ -4,7 +4,7 @@ from datetime import datetime, date from django.core.exceptions import PermissionDenied, ValidationError from django.db import IntegrityError, ProgrammingError, transaction from django.db.models import Count, Q -from django.shortcuts import render, redirect, get_object_or_404, resolve_url, render_to_response +from django.shortcuts import render, redirect, get_object_or_404, resolve_url from django.contrib.auth.decorators import login_required from django.http import HttpResponse, HttpResponseBadRequest, HttpResponseRedirect from django.contrib import messages @@ -200,7 +200,7 @@ def abonamount(request, gid, uname): except lib.MultipleException as errs: for err in errs.err_list: messages.error(request, err) - return render_to_response('abonapp/modal_abonamount.html', { + return render(request, 'abonapp/modal_abonamount.html', { 'abon': abon, 'group_id': gid, 'form': frm @@ -842,7 +842,7 @@ def street_add(request, gid): messages.error(request, _('fix form errors')) else: frm = forms.AbonStreetForm(initial={'group': gid}) - return render_to_response('abonapp/modal_addstreet.html', { + return render(request, 'abonapp/modal_addstreet.html', { 'form': frm, 'gid': gid }) @@ -860,7 +860,7 @@ def street_edit(request, gid): street.save() messages.success(request, _('Streets has been saved')) else: - return render_to_response('abonapp/modal_editstreet.html', { + return render(request, 'abonapp/modal_editstreet.html', { 'gid': gid, 'streets': models.AbonStreet.objects.filter(group=gid) }) @@ -898,7 +898,7 @@ def active_nets(request, gid): def tels(request, gid, uname): abon = get_object_or_404(models.Abon, username=uname) telephones = abon.additional_telephones.all() - return render_to_response('abonapp/modal_additional_telephones.html', { + return render(request, 'abonapp/modal_additional_telephones.html', { 'telephones': telephones, 'gid': gid, 'uname': uname @@ -921,7 +921,7 @@ def tel_add(request, gid, uname): messages.error(request, _('fix form errors')) else: frm = forms.AdditionalTelephoneForm() - return render_to_response('abonapp/modal_add_phone.html', { + return render(request, 'abonapp/modal_add_phone.html', { 'form': frm, 'gid': gid, 'uname': uname @@ -957,7 +957,7 @@ def phonebook(request, gid): for row in telephones: writer.writerow(row) return response - return render_to_response('abonapp/modal_phonebook.html', { + return render(request, 'abonapp/modal_phonebook.html', { 'tels': telephones, 'gid': gid }) @@ -992,7 +992,7 @@ def abon_export(request, gid): return redirect('abonapp:group_list') else: frm = forms.ExportUsersForm() - return render_to_response('abonapp/modal_export.html', { + return render(request, 'abonapp/modal_export.html', { 'gid': gid, 'form': frm }) @@ -1040,7 +1040,7 @@ def add_edit_periodic_pay(request, gid, uname, periodic_pay_id=0): return redirect('abonapp:abon_services', gid, uname) else: frm = forms.PeriodicPayForIdForm(instance=periodic_pay_instance) - return render_to_response('abonapp/modal_periodic_pay.html', { + return render(request, 'abonapp/modal_periodic_pay.html', { 'form': frm, 'gid': gid, 'uname': uname diff --git a/clientsideapp/views.py b/clientsideapp/views.py index 0484edb..ae7a063 100644 --- a/clientsideapp/views.py +++ b/clientsideapp/views.py @@ -1,5 +1,5 @@ from django.contrib.auth.decorators import login_required -from django.shortcuts import render, get_object_or_404, redirect, render_to_response +from django.shortcuts import render, get_object_or_404, redirect from django.contrib import messages from django.db import transaction from django.utils.translation import gettext_lazy as _, gettext @@ -55,7 +55,7 @@ def buy_service(request, srv_id): abon.nas_sync_self() messages.success(request, _("The service '%s' wan successfully activated") % service.title) else: - return render_to_response('clientsideapp/modal_service_buy.html', { + return render(request, 'clientsideapp/modal_service_buy.html', { 'service': service, 'current_service': current_service.tariff if current_service is not None else None }) diff --git a/devapp/views.py b/devapp/views.py index 8ca18b6..011bf3b 100644 --- a/devapp/views.py +++ b/devapp/views.py @@ -5,7 +5,7 @@ from django.core.exceptions import PermissionDenied from django.db import IntegrityError from django.db.models import Q, Count from django.http import HttpResponse, Http404 -from django.shortcuts import render, redirect, get_object_or_404, resolve_url, render_to_response +from django.shortcuts import render, redirect, get_object_or_404, resolve_url from django.contrib import messages from django.utils.decorators import method_decorator from django.utils.translation import gettext_lazy as _, gettext @@ -357,7 +357,7 @@ def delete_single_port(request, group_id, device_id, portid): Port.objects.get(pk=portid).delete() messages.success(request, _('Port successfully removed')) else: - return render_to_response('devapp/manage_ports/modal_del_port.html', { + return render(request, 'devapp/manage_ports/modal_del_port.html', { 'grp': group_id, 'did': device_id, 'port_id': portid @@ -384,7 +384,7 @@ def edit_single_port(request, group_id, device_id, port_id): return redirect('devapp:manage_ports', group_id, device_id) frm = PortForm(instance=port) - return render_to_response('devapp/manage_ports/modal_add_edit_port.html', { + return render(request, 'devapp/manage_ports/modal_add_edit_port.html', { 'port_id': port_id, 'did': device_id, 'gid': group_id, @@ -415,7 +415,7 @@ def add_single_port(request, group_id, device_id): 'num': request.GET.get('n'), 'descr': request.GET.get('t') }) - return render_to_response('devapp/manage_ports/modal_add_edit_port.html', { + return render(request, 'devapp/manage_ports/modal_add_edit_port.html', { 'did': device_id, 'gid': group_id, 'form': frm diff --git a/dialing.py b/dialing.py index 7bd1858..b9042e6 100755 --- a/dialing.py +++ b/dialing.py @@ -40,7 +40,7 @@ def secure_request(data: Dict) -> Optional[AnyStr]: sign = calc_hash('_'.join(vars_to_hash)) data.update({'sign': sign}) try: - with urlopen("%s/dialing/api/sms?%s" % (SERVER_DOMAIN, urlencode(data))) as r: + with urlopen("%s/dialing/api/sms/?%s" % (SERVER_DOMAIN, urlencode(data))) as r: return r.read() except ConnectionRefusedError: print('ERROR: connection refused') diff --git a/dialing_app/views.py b/dialing_app/views.py index 68a46b0..3a17e36 100644 --- a/dialing_app/views.py +++ b/dialing_app/views.py @@ -4,7 +4,7 @@ from django.contrib.auth.decorators import login_required from django.contrib import messages from django.db import ProgrammingError -from django.shortcuts import redirect +from django.shortcuts import redirect, render from django.utils.translation import gettext_lazy as _ from django.utils.decorators import method_decorator from django.views.generic import ListView @@ -151,7 +151,7 @@ def send_sms(request): messages.error(request, _('fix form errors')) else: frm = SMSOutForm(initial={'dst': initial_dst}) - return render_to_response('modal_send_sms.html', { + return render(request, 'modal_send_sms.html', { 'form': frm, 'path': path }) diff --git a/mapapp/views.py b/mapapp/views.py index 6ef48ff..2dc003b 100644 --- a/mapapp/views.py +++ b/mapapp/views.py @@ -2,7 +2,7 @@ from django.contrib import messages from django.contrib.auth.decorators import login_required from django.core.exceptions import PermissionDenied from django.http import HttpResponse, HttpResponseRedirect, HttpResponseForbidden, HttpResponseBadRequest -from django.shortcuts import render, redirect, get_object_or_404, resolve_url, render_to_response +from django.shortcuts import render, redirect, get_object_or_404, resolve_url from django.utils.translation import gettext_lazy as _, gettext from django.utils.decorators import method_decorator from django.db.models import Count @@ -137,7 +137,7 @@ def get_dots(request): @login_required def modal_add_dot(request): if not request.user.has_perm('mapapp.add_dot'): - return render_to_response('403_for_modal.html') + return render(request, '403_for_modal.html') if request.method == 'POST': frm = DotForm(request.POST, request.FILES) if frm.is_valid(): @@ -158,7 +158,7 @@ def modal_add_dot(request): coords = request.GET.get('coords') lat, lon = coords.split(',') frm = DotForm(initial={'latitude': lat, 'longitude': lon}) - return render_to_response('maps/modal_add_dot.html', { + return render(request, 'maps/modal_add_dot.html', { 'coords': coords, 'form': frm }) @@ -175,17 +175,16 @@ def preload_devices(request): dot_devices_ids = tuple(dev.pk for dev in dot_devices.iterator()) del dot_devices - ret = render_to_response('maps/preload_devices_tmpl.html', { + return render(request, 'maps/preload_devices_tmpl.html', { 'all_devices': all_devices.iterator(), 'dot_devices_ids': dot_devices_ids - }) - return HttpResponse(ret, content_type='text/html') + }, content_type='text/html') @login_required def dot_tooltip(request): if not request.user.is_superuser: - return render_to_response('403_for_modal.html') + return render(request, '403_for_modal.html') d = request.GET.get('d') devs, dot = None, None try: @@ -193,7 +192,7 @@ def dot_tooltip(request): devs = dot.devices.all() except Dot.DoesNotExist: pass - return render_to_response('maps/map_tooltip.html', { + return render(request, 'maps/map_tooltip.html', { 'devs': devs.iterator(), 'dot': dot }) diff --git a/msg_app/views.py b/msg_app/views.py index 832a6b5..1eeee5a 100644 --- a/msg_app/views.py +++ b/msg_app/views.py @@ -6,7 +6,7 @@ from django.http import HttpResponse from django.utils.decorators import method_decorator from django.utils.translation import gettext_lazy as _ from django.contrib import messages -from django.shortcuts import render, redirect, get_object_or_404, render_to_response +from django.shortcuts import render, redirect, get_object_or_404 from django.views.generic import ListView from chatbot.models import MessageQueue @@ -37,7 +37,7 @@ def new_conversation(request): else: messages.error(request, _('fix form errors')) else: - return render_to_response('msg_app/modal_new_conversation.html', { + return render(request, 'msg_app/modal_new_conversation.html', { 'form': frm }) except MessageError as e: