From d33cc87da9dbda7ca3435f57a522e136dfde5bcb Mon Sep 17 00:00:00 2001 From: wangyuting2 <851424971@qq.com> Date: Thu, 29 Sep 2022 05:50:16 +0000 Subject: [PATCH] * Fix bug in review code. --- framework/router.class.php | 2 +- module/custom/model.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/router.class.php b/framework/router.class.php index 2981a840d0..3e0fe8b660 100755 --- a/framework/router.class.php +++ b/framework/router.class.php @@ -224,7 +224,7 @@ class router extends baseRouter /* User preference init. */ $config->URSR = $URSR; - $config->URAndSR = $URAndSR && strpos(",{$disabledFeatures},", ',URStory,') === false; + $config->URAndSR = ($URAndSR and strpos(",{$disabledFeatures},", ',URStory,') === false); $config->programLink = 'program-browse'; $config->productLink = 'product-all'; $config->projectLink = 'project-browse'; diff --git a/module/custom/model.php b/module/custom/model.php index cc24f6e11c..af9943a575 100644 --- a/module/custom/model.php +++ b/module/custom/model.php @@ -992,7 +992,7 @@ class customModel extends model { if($this->config->edition == 'max') { - return $this->dao->select('id')->from(TABLE_EXECUTION)->alias('t1') + return $this->dao->select('id')->from(TABLE_PROJECT)->alias('t1') ->leftJoin(TABLE_MEETING)->alias('t2')->on('t1.id = t2.project') ->where('t1.model')->eq('scrum') ->andWhere('t1.deleted')->eq('0') @@ -1012,7 +1012,7 @@ class customModel extends model { if($this->config->edition == 'max') { - return $this->dao->select('id')->from(TABLE_EXECUTION)->alias('t1') + return $this->dao->select('id')->from(TABLE_PROJECT)->alias('t1') ->leftJoin(TABLE_AUDITPLAN)->alias('t2')->on('t1.id = t2.project') ->where('t1.model')->eq('scrum') ->andWhere('t1.deleted')->eq('0')