From 0f2dafb197411b0c214ca124033906b8c7c504de Mon Sep 17 00:00:00 2001 From: Dmitry Novikov Date: Wed, 14 Jun 2017 11:14:07 +0300 Subject: [PATCH] =?UTF-8?q?FIXBUG:=20=D0=BD=D0=B5=20=D1=81=D0=BE=D1=85?= =?UTF-8?q?=D1=80=D0=B0=D0=BD=D1=8F=D0=BB=D0=B8=D1=81=D1=8C=20=D0=BF=D0=B0?= =?UTF-8?q?=D1=81=D0=BF=D0=BE=D1=80=D1=82=D0=BD=D1=8B=D0=B5=20=D0=B4=D0=B0?= =?UTF-8?q?=D0=BD=D0=BD=D1=8B=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- abonapp/views.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/abonapp/views.py b/abonapp/views.py index 8bf390e..c3d62f5 100644 --- a/abonapp/views.py +++ b/abonapp/views.py @@ -630,10 +630,15 @@ def passport_view(request, gid, uid): try: abon = models.Abon.objects.get(pk=uid) if request.method == 'POST': - frm = forms.PassportForm(request.POST, initial={'abon': abon}) + try: + passport_instance = models.PassportInfo.objects.get(abon=abon) + except models.PassportInfo.DoesNotExist: + passport_instance = None + frm = forms.PassportForm(request.POST, instance=passport_instance) if frm.is_valid(): - passp_instance = frm.save(commit=False) - passp_instance.save() + pi = frm.save(commit=False) + pi.abon = abon + pi.save() messages.success(request, _('Passport information has been saved')) return redirect('abonapp:passport_view', gid=gid, uid=uid) else: @@ -868,7 +873,6 @@ def abon_ping(request): def dials(request, gid, uid): abon = get_object_or_404(models.Abon, pk=uid) if hasattr(abon.group, 'pk') and abon.group.pk != int(gid): - print(gid, type(gid), abon.group.pk, type(abon.group.pk)) return redirect('abonapp:dials', abon.group.pk, abon.pk) if abon.telephone is not None and abon.telephone != '': tel = abon.telephone.replace('+', '')