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

+ [task#125051,done,0.1h,0h] Adjust code.

Browse Source
This commit is contained in:
zhaixiaojian
2024-08-15 14:44:48 +08:00
committed by 李阳
parent f6be5ed98f
commit 3e312e6ce0
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/repo/control.php
+8 -7
View File
@@ -584,23 +584,24 @@ class repo extends control
$logs = $this->repo->getCommits($repo, $entry, $branchID, 'dir', $pager, '', '', $query);
$revisionIds = array_column($logs, 'revision');
$stories = $this->loadModel('story')->getLinkedCommits($repoID, $revisionIds);
$designs = $this->loadModel('design')->getLinkedCommits($repoID, $revisionIds);
$tasks = $this->loadModel('task')->getLinkedCommits($repoID, $revisionIds);
$bugs = $this->loadModel('bug')->getLinkedCommits($repoID, $revisionIds);
$modelCommits = new stdClass();
$modelCommits->stories = $this->loadModel('story')->getLinkedCommits($repoID, $revisionIds);
$modelCommits->designs = $this->loadModel('design')->getLinkedCommits($repoID, $revisionIds);
$modelCommits->tasks = $this->loadModel('task')->getLinkedCommits($repoID, $revisionIds);
$modelCommits->bugs = $this->loadModel('bug')->getLinkedCommits($repoID, $revisionIds);
/* Set tips and buttons for different relations. */
foreach($logs as $logItem)
{
$logItem->relationFieldTips = '';
foreach(array('designs' => 'design', 'stroies' => 'story', 'tasks' => 'task' , 'bugs' => 'bug') as $fieldType=>$moduleName)
{
if(!empty(${$fieldType}[$logItem->revision]))
if(!empty($modelCommits->{$fieldType}[$logItem->revision]))
{
$fieldCommits = ${$fieldType}[$logItem->revision];
$fieldCommits = $modelCommits->{$fieldType}[$logItem->revision];
$logItem->relationFieldTips .= ' ' . $this->lang->repo->{$moduleName};
foreach($fieldCommits as $item) $item->url = !empty($item->id) ? $this->createLink($moduleName, 'view', "{$moduleName}ID=" . $item->id) : '';
$logItem->relationFieldTips .= ' #'.implode(' #', array_column($fieldCommits, 'id'));
$logItem->relationField[$fieldType] = ${$fieldType}[$logItem->revision];
$logItem->relationField[$fieldType] = $fieldCommits;
}
}
}
module/repo/ui/log.html.php
+2 -1
View File
@@ -60,7 +60,8 @@ foreach($logs as $log)
if (!empty($log->relationField[$key]))
{
$log->relations .= html::commonButton($lang->repo->{$value}, '', 'btn size-sm mx-2');
foreach ($log->relationField[$key] as $item) {
foreach ($log->relationField[$key] as $item)
{
$log->relations .= html::a($item->url, '#' . $item->id);
}
}