Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'release20.1' into epic

Browse Source
This commit is contained in:
sunguangming
2024-06-03 08:37:13 +08:00
parent 5f6ab12db7 35c6b4b1b1
commit 2df4be8038
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/base/router.class.php
+6 -4
View File
@@ -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;
}
}
module/block/control.php
+1
View File
@@ -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();
}
module/testtask/control.php
+1 -1
View File
@@ -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);
module/todo/control.php
+1 -1
View File
@@ -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')