From aba3572673a67e78e4adad7299f4a9cf79f3f204 Mon Sep 17 00:00:00 2001
From: Dmitry Novikov <nerosketch@gmail.com>
Date: Wed, 27 Sep 2017 15:01:23 +0300
Subject: [PATCH] fix

---
 devapp/templates/devapp/dev.html | 4 ++--
 taskapp/views.py                 | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/devapp/templates/devapp/dev.html b/devapp/templates/devapp/dev.html
index f7daeda..43e627d 100644
--- a/devapp/templates/devapp/dev.html
+++ b/devapp/templates/devapp/dev.html
@@ -89,10 +89,10 @@
                         <input type="hidden" name="parent_dev" class="selectajax-hid"{% if selected_parent_dev %} value="{{ selected_parent_dev.pk }}"{% endif %}>
                         {% if selected_parent_dev %}
                             <button class="selectajax-btn form-control btn btn-default">{{ selected_parent_dev.comment }}</button>
-                            <input type="text" class="form-control dropdown-toggle selectajax-inp hidden" data-toggle="dropdown" id="id_parent_dev" placeholder="{% trans 'Find the device' %}" required>
+                            <input type="text" class="form-control dropdown-toggle selectajax-inp hidden" data-toggle="dropdown" id="id_parent_dev" placeholder="{% trans 'Find the device' %}">
                         {% else %}
                             <button class="selectajax-btn form-control btn btn-default hidden"></button>
-                            <input type="text" class="form-control dropdown-toggle selectajax-inp" data-toggle="dropdown" id="id_parent_dev" placeholder="{% trans 'Find the device' %}" required>
+                            <input type="text" class="form-control dropdown-toggle selectajax-inp" data-toggle="dropdown" id="id_parent_dev" placeholder="{% trans 'Find the device' %}">
                         {% endif %}
                         <ul class="dropdown-menu selectajax-ul"></ul>{{ form.parent_dev.errors }}
                     </div>
diff --git a/taskapp/views.py b/taskapp/views.py
index d8ec471..d5468be 100644
--- a/taskapp/views.py
+++ b/taskapp/views.py
@@ -181,8 +181,11 @@ def task_finish(request, task_id):
 @login_required
 @only_admins
 def task_failed(request, task_id):
-    task = get_object_or_404(Task, id=task_id)
-    task.do_fail(request.user)
+    try:
+        task = get_object_or_404(Task, id=task_id)
+        task.do_fail(request.user)
+    except TaskException as e:
+        messages.error(request, e)
     return redirect('taskapp:home')