Show comments on approved todos as well (#472)

* show positive feedback comments on todolists * Marked only todos with disapproved comments as red * Fixed the bug where todos will show in red if todo qa was created with approved as null
b12io · Jul 27, 2018 · 2983fa5 · 2983fa5
1 parent c779b64
commit 2983fa5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/orchestra/static/dist/main.js b/orchestra/static/dist/main.js
@@ -61812,7 +61812,7 @@ function todoChecklist() {
       };
 
       scope.isInDanger = function (todo) {
-        return !todo.completed && _momentTimezone2.default.isBeforeNowBy(todo.due_datetime, 1, 'days') || scope.todoQas[todo.description];
+        return !todo.completed && _momentTimezone2.default.isBeforeNowBy(todo.due_datetime, 1, 'days') || scope.todoQas[todo.description] && scope.todoQas[todo.description].approved === false;
       };
 
       scope.isSkipped = function (todo) {

diff --git a/orchestra/static/orchestra/todos/todo-checklist.directive.es6.js b/orchestra/static/orchestra/todos/todo-checklist.directive.es6.js
@@ -35,7 +35,7 @@ export default function todoChecklist () {
       }
 
       scope.isInDanger = (todo) => {
-        return (!todo.completed && moment.isBeforeNowBy(todo.due_datetime, 1, 'days')) || scope.todoQas[todo.description]
+        return (!todo.completed && moment.isBeforeNowBy(todo.due_datetime, 1, 'days')) || (scope.todoQas[todo.description] && scope.todoQas[todo.description].approved === false)
       }
 
       scope.isSkipped = (todo) => {

diff --git a/orchestra/todos/views.py b/orchestra/todos/views.py
@@ -58,7 +58,7 @@ def worker_task_recent_todo_qas(request):
     task_todo_qas = TodoQA.objects.filter(todo__task=task_id)
 
     if task_todo_qas.exists():
-        todo_qas = task_todo_qas.filter(approved=False)
+        todo_qas = task_todo_qas
     else:
         task = Task.objects.get(pk=task_id)
         most_recent_worker_task_todo_qa = TodoQA.objects.filter(