From 8ffe67cbbd2c2d3c3ffd9d6e12a9da3fbf0d7749 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Wed, 8 Feb 2017 19:34:42 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=20complete=5Fservice=20=D0=B5=D1=81?= =?UTF-8?q?=D0=BB=D0=B8=20=D0=BF=D1=83=D1=82=D1=8C=20=D0=BD=D0=B5=20=D1=81?= =?UTF-8?q?=D0=BE=D0=B2=D0=BF=D0=B0=D0=B4=D0=B0=D0=B5=D1=82=20=D1=81=20?= =?UTF-8?q?=D0=B8=D0=BD=D1=84=D0=BE=D0=B9=20=D0=B8=D0=B7=20=D0=B1=D0=B0?= =?UTF-8?q?=D0=B7=D1=8B,=20=D1=82=D0=BE=20=D1=80=D0=B5=D0=B4=D0=B8=D1=80?= =?UTF-8?q?=D0=B5=D0=BA=D1=82=D0=B8=D0=BC=20=D0=BD=D0=B0=20=D0=BF=D1=80?= =?UTF-8?q?=D0=B0=D0=B2=D0=B8=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9=20=D0=BF=D1=83?= =?UTF-8?q?=D1=82=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- abonapp/views.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/abonapp/views.py b/abonapp/views.py index 4361cef..f8edac8 100644 --- a/abonapp/views.py +++ b/abonapp/views.py @@ -10,7 +10,7 @@ from django.http import HttpResponse, Http404 from django.contrib import messages from tariff_app.models import Tariff -from agent import NasFailedResult, AbonStruct, Transmitter, TariffStruct, NasNetworkError +from agent import NasFailedResult, Transmitter, NasNetworkError from . import forms from . import models from ip_pool.models import IpPoolItem @@ -383,8 +383,9 @@ def chpriority(request, gid, uid): def complete_service(request, gid, uid, srvid): abtar = get_object_or_404(models.AbonTariff, id=srvid) - if abtar.abon.id != int(uid): - return HttpResponse('

uid not equal uid from service

') + if int(abtar.abon.pk) != int(uid) or int(abtar.abon.group.pk) != int(gid): + # если что-то написали в урле вручную, то вернём на путь истинный + return redirect('abonapp:compl_srv', gid=abtar.abon.group.pk, uid=abtar.abon.pk, srvid=srvid) time_use = None try: if request.method == 'POST': @@ -394,7 +395,7 @@ def complete_service(request, gid, uid, srvid): # удаляем запись о текущей услуге. abtar.delete() messages.success(request, 'Услуга успешно завершена') - return redirect('abonapp:abon_home', gid, uid) + return redirect('abonapp:abon_services', gid, uid) else: raise models.LogicError('Действие не подтверждено')