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

Merge branch '15.0'

Browse Source
This commit is contained in:
wangyidong
2021-07-06 19:28:30 +08:00
parent 1d11be7552 396954c678
commit fa4fa5941e
165 changed files with 4714 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/search/model.php
+3 -3
View File
@@ -577,7 +577,7 @@ class searchModel extends model
if(!isset($this->config->objectTables[$record->objectType])) continue;
$table = $this->config->objectTables[$record->objectType];
$projectID = $this->dao->select('project')->from($table)->where('id')->eq($record->objectID)->fetch('project');
$record->url = helper::createLink($module, $method, "id={$record->objectID}", '', false, $projectID);
$record->url = helper::createLink($module, $method, "id={$record->objectID}");
}
elseif($module == 'issue')
{
@@ -594,7 +594,7 @@ class searchModel extends model
elseif($module == 'execution')
{
$execution = $this->dao->select('id,type,project')->from(TABLE_EXECUTION)->where('id')->eq($record->objectID)->fetch();
$record->url = helper::createLink('execution', $method, "id={$record->objectID}", '', false, $execution->project);
$record->url = helper::createLink('execution', $method, "id={$record->objectID}");
$record->extraType = $execution->type;
}
elseif($module == 'story')
@@ -634,7 +634,7 @@ class searchModel extends model
}
else
{
$record->url = helper::createLink($module, $method, "id={$record->objectID}", '', false, 0, true);
$record->url = helper::createLink($module, $method, "id={$record->objectID}");
}
}