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

Merge branch 'sprint/zentaopms240_wangyuting' into 'sprint/zentaopms240'

Browse Source 
* Fix bug in review code.

See merge request easycorp/zentaopms!5612
This commit is contained in:
王 于听
2022-09-29 05:51:04 +00:00
parent b5075cfb2d d33cc87da9
commit 59d85868b5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/router.class.php
+1 -1
View File
@@ -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';
module/custom/model.php
+2 -2
View File
@@ -1019,7 +1019,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')
@@ -1039,7 +1039,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')