Merge branch 'devel' of https://github.com/nerosketch/djing into devel

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>

taskapp/views.py

@@ -182,8 +182,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')