Browse Source

FIXBUG: исправил когда не было абонента с переданным логином то возвращался error404, теперь говрит сообщением об отсутствии абонента

devel
bashmak 9 years ago
parent
commit
68198df0a0
  1. 3
      taskapp/locale/ru/LC_MESSAGES/django.po
  2. 17
      taskapp/views.py

3
taskapp/locale/ru/LC_MESSAGES/django.po

@ -360,3 +360,6 @@ msgstr "Назначенные мной задачи"
msgid "All my tasks" msgid "All my tasks"
msgstr "Все мои задачи" msgstr "Все мои задачи"
msgid "User '%s' does not exist"
msgstr "Абонент с логином '%s' не найден"

17
taskapp/views.py

@ -101,7 +101,7 @@ def view(request, task_id):
@only_admins @only_admins
def task_add_edit(request, task_id=0): def task_add_edit(request, task_id=0):
task_id = safe_int(task_id) task_id = safe_int(task_id)
uid = request.GET.get('uid')
uid = request.GET.get('uid', 0)
selected_abon = None selected_abon = None
frm = TaskFrm() frm = TaskFrm()
@ -119,11 +119,8 @@ def task_add_edit(request, task_id=0):
frm = TaskFrm(instance=tsk) frm = TaskFrm(instance=tsk)
selected_abon = tsk.abon selected_abon = tsk.abon
if uid:
selected_abon = get_object_or_404(Abon, username=str(uid))
if request.method == 'POST':
try:
try:
if request.method == 'POST':
tsk.author = request.user tsk.author = request.user
frm = TaskFrm(request.POST, request.FILES, instance=tsk) frm = TaskFrm(request.POST, request.FILES, instance=tsk)
@ -150,8 +147,12 @@ def task_add_edit(request, task_id=0):
messages.error(request, _('You must select the subscriber')) messages.error(request, _('You must select the subscriber'))
else: else:
messages.error(request, _('Error in the form fields')) messages.error(request, _('Error in the form fields'))
except TelegramBot.DoesNotExist:
messages.error(request, _('Employee has not yet signed up for notifications'))
elif uid:
selected_abon = Abon.objects.get(username=str(uid))
except TelegramBot.DoesNotExist:
messages.error(request, _('Employee has not yet signed up for notifications'))
except Abon.DoesNotExist:
messages.warning(request, _("User '%s' does not exist") % str(uid))
return render(request, 'taskapp/add_edit_task.html', { return render(request, 'taskapp/add_edit_task.html', {
'form': frm, 'form': frm,

Loading…
Cancel
Save