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

*Finish task #48844.*Finish task #48844.*Finish task #48844.*Finish task #48844.*Finish task #48844.*Finish task #48844.*Finish task #48844.*Finish task #48844.

Browse Source
This commit is contained in:
zhouxudong
2022-02-11 17:33:22 +08:00
parent 0e5f623acc
commit c3112657d2
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/bug/control.php
View File

@@ -1710,8 +1710,8 @@ class bug extends control
public function linkBugs($bugID, $browseType = '', $param = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
/* Load pager. */
$this->app->loadClass('pager', $static = true);
$pager = new pager($recTotal, $recPerPage, $pageID);
$this->app->loadClass('pager', $static = true);
$pager = new pager($recTotal, $recPerPage, $pageID);
/* Get bug and queryID. */
$bug = $this->bug->getById($bugID);

8
module/bug/model.php
View File

@@ -1365,12 +1365,8 @@ class bugModel extends model
if($browseType == 'bySearch')
{
$bug = $this->getById($bugID);
$bugs2Link = $this->getBySearch($bug->product, 'all', $queryID, 'id', '', $pager);
foreach($bugs2Link as $key => $bug2Link)
{
if($bug2Link->id == $bugID) unset($bugs2Link[$key]);
if(in_array($bug2Link->id, explode(',', $bug->linkBug))) unset($bugs2Link[$key]);
}
$bugIDList = $bug->id . ',' . $bug->linkBug;
$bugs2Link = $this->getBySearch($bug->product, 'all', $queryID, 'id', $bugIDList ,$pager);
return $bugs2Link;
}
else

2
module/execution/lang/zh-cn.php
View File

@@ -97,7 +97,7 @@ $lang->execution->burnYUnit = '(工时)';
$lang->execution->waitTasks = '待处理';
$lang->execution->viewByUser = '按用户查看';
$lang->execution->oneProduct = "阶段只能关联一个{$lang->productCommon}";
$lang->execution->noLinkProduct = "阶段没有关联{$lang->productCommon}";
$lang->execution->noLinkProduct = "关联{$lang->productCommon}不能为空！";
$lang->execution->recent = '近期访问：';
$lang->execution->copyNoExecution = '没有可用的' . $lang->executionCommon . '来复制';
$lang->execution->noTeam = '暂时没有团队成员';