From 2731d22fac9ad8cb412cdb8d48c19d6632686b39 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Fri, 31 May 2024 17:23:35 +0800
Subject: [PATCH 1/4] * [bug#50292,done,0.1h] add cancel link.

---
 module/todo/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/todo/control.php b/module/todo/control.php
index d7dcc93b62..d1677e86e9 100755
--- a/module/todo/control.php
+++ b/module/todo/control.php
@@ -399,7 +399,7 @@ class todo extends control
             if($todo->type == 'feedback') $tab = 'feedback';
             if(in_array($todo->type, array('issue', 'risk'))) $tab = 'project';
 
-            return $this->send(array('result' => 'success', 'callback' => "zui.Modal.confirm({message: '{$message}', icon: 'icon-exclamation-sign', iconClass: 'warning-pale rounded-full icon-2x'}).then((res) => {if(res) openPage('{$confirmURL}', '{$tab}');});"));
+            return $this->send(array('result' => 'success', 'callback' => "zui.Modal.confirm({message: '{$message}', icon: 'icon-exclamation-sign', iconClass: 'warning-pale rounded-full icon-2x'}).then((res) => {if(res) openPage('{$confirmURL}', '{$tab}'); else loadCurrentPage();});"));
         }
 
         if(defined('RUN_MODE') && RUN_MODE == 'api')

From 74d0082e9e3696e6adaae74171da0205f9e1ba2e Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Fri, 31 May 2024 17:24:48 +0800
Subject: [PATCH 2/4] + Add project id to show 1.5level drop menu.

---
 module/block/control.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/block/control.php b/module/block/control.php
index 1448695eec..2cd6b208d5 100755
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -58,6 +58,7 @@ class block extends control
 
         $this->view->title     = zget($this->lang->block->dashboard, $dashboard, $this->lang->block->dashboard['default']);
         $this->view->blocks    = $blocks;
+        $this->view->projectID = $projectID;
         $this->view->dashboard = $dashboard;
         $this->display();
     }

From 048d64f40bded979efd41beba280978ea03e0351 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Fri, 31 May 2024 17:34:13 +0800
Subject: [PATCH 3/4]  * Fix bug #50499.

---
 framework/base/router.class.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/framework/base/router.class.php b/framework/base/router.class.php
index f7880ebf23..20a685956b 100644
--- a/framework/base/router.class.php
+++ b/framework/base/router.class.php
@@ -3455,11 +3455,13 @@ class baseRouter
      */
     public function checkInstalled()
     {
-        if(!isset($this->config->installed) || !$this->config->installed) return false;
-        if(($this->config->inContainer || $this->config->inQuickon) && !$this->getInstalledVersion()) return false;
+        $installed = true;
+        if(!isset($this->config->installed) || !$this->config->installed) $installed = false;
+        if(($this->config->inContainer || $this->config->inQuickon) && !$this->getInstalledVersion()) $installed = false;
 
-        if(!isset($_SESSION['installing'])) $_SESSION['installing'] = true;
-        return true;
+        if(!isset($_SESSION['installing']) && !$installed && !empty($this->installing)) $_SESSION['installing'] = true;
+
+        return $installed;
     }
 }
 

From 35c6b4b1b127abf952701449dbccb0154b875539 Mon Sep 17 00:00:00 2001
From: liugang <liugang@easycorp.ltd>
Date: Fri, 31 May 2024 18:31:11 +0800
Subject: [PATCH 4/4] * testtask: convert module in cookie to int to avoid type
 error.

---
 module/testtask/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/testtask/control.php b/module/testtask/control.php
index 0aab41a548..ece025a05e 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -399,7 +399,7 @@ class testtask extends control
         $this->app->loadClass('pager', $static = true);
         $pager    = pager::init($recTotal, $recPerPage, $pageID);
         $queryID  = ($browseType == 'bysearch' or $browseType == 'bysuite') ? $param : 0;
-        $moduleID = ($browseType == 'bymodule') ? $param : ($browseType == 'bysearch' ? 0 : ($this->cookie->taskCaseModule ?: 0));
+        $moduleID = ($browseType == 'bymodule') ? $param : ($browseType == 'bysearch' ? 0 : ((int)$this->cookie->taskCaseModule ?: 0));
         $sort     = common::appendOrder($orderBy, 't2.id');
         $sort     = str_replace('case_', 'id_', $sort);