From 9105a060c1c632391cc76f02d967b244a6c1863b Mon Sep 17 00:00:00 2001 From: Dmitry Date: Fri, 9 Dec 2016 14:00:08 +0000 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BD=D0=B0=D1=87=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D0=B5?= =?UTF-8?q?=20=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B8=20=D0=B2=D1=8B=D0=B1=D0=BE=D1=80=D0=B5=20=D0=B0?= =?UTF-8?q?=D0=B1=D0=BE=D0=BD=D0=B5=D0=BD=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- taskapp/views.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/taskapp/views.py b/taskapp/views.py index 94cf7d8..db76272 100644 --- a/taskapp/views.py +++ b/taskapp/views.py @@ -1,5 +1,6 @@ # coding=utf-8 from django.contrib.auth.decorators import login_required +from django.forms.boundfield import BoundField from django.shortcuts import render, redirect, get_object_or_404 from abonapp.models import Abon @@ -81,6 +82,7 @@ def task_add_edit(request, task_id=0): warntext = '' uid = request.GET.get('uid') + selected_abon = None # чтоб при добавлении сразу был выбран исполнитель frm_recipient_id = safe_int(request.GET.get('rp')) @@ -101,9 +103,10 @@ def task_add_edit(request, task_id=0): if task_id == 0: try: uid = int(uid or 0) + selected_abon = None if uid == 0 else get_object_or_404(Abon, username=str(uid)) frm = TaskFrm(initial={ 'recipient': frm_recipient_id, - 'abon': None if uid == 0 else get_object_or_404(Abon, username=str(uid)) + 'abon': selected_abon }) except ValueError: warntext=u'Передаваемый логин абонента должен состоять только из цифр' @@ -112,11 +115,13 @@ def task_add_edit(request, task_id=0): }) else: frm = TaskFrm(instance=tsk) + selected_abon = tsk.abon return render(request, 'taskapp/add_edit_task.html', { 'warntext': warntext, 'form': frm, - 'task_id': tsk.id + 'task_id': tsk.id, + 'selected_abon': selected_abon })