Merge branch 'master' into 'sprint/master_fixbug'

# Conflicts: # module/project/model.php
2022-04-02 07:33:24 +00:00
parent b352dc9a86 388314c625
commit adb3a7ea72
94 changed files with 1290 additions and 624 deletions
@@ -833,7 +833,7 @@ class task extends control
        }

        $execution = $this->execution->getById($task->execution);
-        if(!isonlybody() and $execution->type == 'kanban') return $this->locate($this->createLink('execution', 'kanban', "executionID=$execution->id"));
+        if(!isonlybody() and $execution->type == 'kanban') return print(js::locate($this->createLink('execution', 'kanban', "executionID=$execution->id")));

        $this->session->project = $task->project;