From a7c944d3e52affb49110b1f2b411782db355550e Mon Sep 17 00:00:00 2001 From: liumengyi Date: Tue, 18 Jan 2022 13:16:20 +0800 Subject: [PATCH 1/2] * Fix bug #18629. --- module/execution/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/execution/control.php b/module/execution/control.php index ec5fdb6b35..b981787d00 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -125,7 +125,7 @@ class execution extends control /* Get products by execution. */ $execution = $this->commonAction($executionID, $status); - if($execution->type == 'kanban') $this->locate($this->createLink('execution', 'kanban', "executionID=$executionID")); + if($execution->type == 'kanban') $this->locate($this->createLink('execution', 'kanban', "executionID=$execution->id")); $executionID = $execution->id; $products = $this->product->getProductPairsByProject($executionID); From 42a352dc201138afad2110cd403ab6c465db0daf Mon Sep 17 00:00:00 2001 From: liumengyi Date: Tue, 18 Jan 2022 13:18:44 +0800 Subject: [PATCH 2/2] * Fix bug #18629. --- module/execution/control.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/module/execution/control.php b/module/execution/control.php index b981787d00..d0b5a6e3a3 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -123,12 +123,13 @@ class execution extends control /* Set browse type. */ $browseType = strtolower($status); - /* Get products by execution. */ - $execution = $this->commonAction($executionID, $status); - if($execution->type == 'kanban') $this->locate($this->createLink('execution', 'kanban', "executionID=$execution->id")); - + $execution = $this->commonAction($executionID, $status); $executionID = $execution->id; - $products = $this->product->getProductPairsByProject($executionID); + + if($execution->type == 'kanban') $this->locate($this->createLink('execution', 'kanban', "executionID=$executionID")); + + /* Get products by execution. */ + $products = $this->product->getProductPairsByProject($executionID); setcookie('preExecutionID', $executionID, $this->config->cookieLife, $this->config->webRoot, '', false, true); /* Save the recently five executions visited in the cookie. */