From aa86de638cdc059e432b7f3b124989d96dfa7f20 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Tue, 30 Nov 2021 09:43:20 +0800 Subject: [PATCH 1/2] * Fix bug #16907. --- module/block/model.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/block/model.php b/module/block/model.php index ab34ff2761..03b5a6d941 100644 --- a/module/block/model.php +++ b/module/block/model.php @@ -171,9 +171,9 @@ class blockModel extends model ->leftJoin(TABLE_PROJECT)->alias('t3')->on('t1.execution=t3.id') ->where('t1.assignedTo')->eq($this->app->user->account) ->andWhere('t2.status')->ne('suspended') - ->andWhere('t3.status')->ne('suspended') + ->beginIF('t3.Id is not null')->andWhere('t3.status')->ne('suspended')->fi() ->andWhere('t2.type')->eq('project') - ->andWhere('t3.type')->eq('sprint') + ->andWhere('t3.type')->in('sprint,stage') ->andWhere('t1.deleted')->eq(0) ->andWhere('t2.deleted')->eq(0) ->andWhere('t3.deleted')->eq(0) From b264aa3199f77ff97681e320b0ec8e587ea12da6 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Tue, 30 Nov 2021 09:46:30 +0800 Subject: [PATCH 2/2] * Fix bug 16807,16892. --- module/action/lang/en.php | 2 +- module/block/model.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/action/lang/en.php b/module/action/lang/en.php index d8f8cdd729..9767de0ddb 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -498,7 +498,7 @@ $lang->action->label->testtask = 'Request|testtask|view|caseID=%s'; $lang->action->label->testsuite = 'Test Suite|testsuite|view|suiteID=%s'; $lang->action->label->caselib = 'Case Library|caselib|view|libID=%s'; $lang->action->label->todo = 'Todo|todo|view|todoID=%s'; -$lang->action->label->doclib = 'Doc Library|doc|objectLibs|type=%s&objectID=%s&libID=%s&docID=&version=&appendLib=%s'; +$lang->action->label->doclib = 'Doc Library|doc|objectLibs|type=%s&objectID=%s&libID=%s'; $lang->action->label->doc = 'Doc|doc|view|docID=%s'; $lang->action->label->user = 'User|user|view|account=%s'; $lang->action->label->testreport = 'Report|testreport|view|report=%s'; diff --git a/module/block/model.php b/module/block/model.php index 03b5a6d941..6c2acd1c37 100644 --- a/module/block/model.php +++ b/module/block/model.php @@ -171,7 +171,7 @@ class blockModel extends model ->leftJoin(TABLE_PROJECT)->alias('t3')->on('t1.execution=t3.id') ->where('t1.assignedTo')->eq($this->app->user->account) ->andWhere('t2.status')->ne('suspended') - ->beginIF('t3.Id is not null')->andWhere('t3.status')->ne('suspended')->fi() + ->andWhere('t3.status')->ne('suspended') ->andWhere('t2.type')->eq('project') ->andWhere('t3.type')->in('sprint,stage') ->andWhere('t1.deleted')->eq(0)