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

Merge branch 'sprint/175_liumengyi_16907' into 'sprint/168'

Browse Source 
* Fix bug 16807,16892.

See merge request easycorp/zentaopms!658
This commit is contained in:
李玉春
2021-11-30 02:47:03 +00:00
parent 9e14a2ac9f b264aa3199
commit d37bced9ee
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/lang/en.php
+1 -1
View File
@@ -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';
module/block/model.php
+1 -1
View File
@@ -173,7 +173,7 @@ class blockModel extends model
->andWhere('t2.status')->ne('suspended')
->andWhere('t3.status')->ne('suspended')
->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)