From b2e99c8dd4696e549960a06dba9196722c7877dd Mon Sep 17 00:00:00 2001 From: tianshujie Date: Sat, 2 Apr 2022 10:37:43 +0800 Subject: [PATCH] * Modify the jump link mode. --- module/execution/control.php | 8 ++++---- module/task/control.php | 2 +- module/upgrade/control.php | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/module/execution/control.php b/module/execution/control.php index 282a0798ae..98c1b23534 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -1971,7 +1971,7 @@ class execution extends control 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")); + return print(js::locate(inlink('kanban', "executionID=$executionID"))); } $this->app->loadLang('program'); @@ -2041,7 +2041,7 @@ class execution extends control $this->lang->execution->menu = new stdclass(); $execution = $this->commonAction($executionID); - if($execution->type != 'kanban') return $this->locate(inlink('view', "executionID=$executionID")); + if($execution->type != 'kanban') return print(js::locate(inlink('view', "executionID=$executionID"))); $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $browseType, $orderBy, 0, $groupBy); $executionActions = array(); @@ -3279,8 +3279,8 @@ class execution extends control $this->view->project = $project; $this->project->setMenu($projectID); - if(!$projectID) return $this->locate($this->createLink('project', 'browse')); - if(!empty($project->model) and $project->model == 'kanban' and !(defined('RUN_MODE') and RUN_MODE == 'api')) return $this->locate($this->createLink('project', 'index', "projectID=$projectID")); + if(!$projectID) return print(js::locate($this->createLink('project', 'browse'))); + if(!empty($project->model) and $project->model == 'kanban' and !(defined('RUN_MODE') and RUN_MODE == 'api')) return print(js::locate($this->createLink('project', 'index', "projectID=$projectID"))); } if($this->app->viewType == 'mhtml') diff --git a/module/task/control.php b/module/task/control.php index 4b9de25297..25ce86ce2a 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -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; diff --git a/module/upgrade/control.php b/module/upgrade/control.php index 960f4aeb1c..335390a852 100644 --- a/module/upgrade/control.php +++ b/module/upgrade/control.php @@ -718,7 +718,7 @@ class upgrade extends control } $extFiles = $this->upgrade->getExtFiles(); - if(!empty($extFiles) and $skipMoveFile == 'no') return $this->locate(inlink('moveExtFiles', "fromVersion=$fromVersion")); + if(!empty($extFiles) and $skipMoveFile == 'no') return print(js::locate(inlink('moveExtFiles', "fromVersion=$fromVersion"))); $response = $this->upgrade->removeEncryptedDir(); if($response['result'] == 'fail')