Merge branch 'bugfix_cyy' into 'master'

Modify app language and API See merge request easycorp/zentaopms!2488
2022-03-24 00:29:54 +00:00
parent 7c8dcef938 b7b3a26e33
commit 6729298c92
4 changed files with 27 additions and 1 deletions
@@ -1980,7 +1980,11 @@ class execution extends control
        $type = $this->config->vision == 'lite' ? 'kanban' : 'stage,sprint,kanban';
        if(empty($execution) || strpos($type, $execution->type) === false) return print(js::error($this->lang->notFound) . js::locate('back'));

-        if($execution->type == 'kanban') return $this->locate(inlink('kanban', "executionID=$executionID"));
+        if($execution->type == 'kanban')
+        {
+            if(defined('RUN_MODE') && RUN_MODE == 'api') return print($this->fetch('execution', 'kanban', "executionID=$executionID"));
+            return $this->locate(inlink('kanban', "executionID=$executionID"));
+        }

        $this->app->loadLang('program');