Merge pull request #1456 from NicoPennec/fix/various

Various fixes
cgwire · Jun 4, 2024 · c91a59e · c91a59e
2 parents f9292c8 + 6713956
commit c91a59e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/assets/background/schedule-white-1.png b/src/assets/background/schedule-white-1.png
diff --git a/src/store/api/tasks.js b/src/store/api/tasks.js
@@ -84,7 +84,7 @@ export default {
   },
 
   getTaskComment(data) {
-    return client.pget(`/api/data/comments/${data.id}`)
+    return client.pget(`/api/data/comments/${data.id}?relations=true`)
   },
 
   editTaskComment(comment) {

diff --git a/src/store/modules/tasks.js b/src/store/modules/tasks.js
@@ -1235,7 +1235,9 @@ const mutations = {
 
   [EDIT_TASK_DATES](state, { taskId, data }) {
     const task = state.taskMap.get(taskId)
-    Object.assign(task, data)
+    if (task) {
+      Object.assign(task, data)
+    }
   },
 
   [ASSIGN_TASKS](state, { selectedTaskIds, personId }) {