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

+ [task#125051,done,0.1h,0h] Code optimization and style adjustment.

Browse Source
This commit is contained in:
zhaixiaojian
2024-08-15 14:44:48 +08:00
committed by 李阳
parent c6a067b996
commit 95d8d13bcf
3 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/repo/control.php
+14 -26
View File
@@ -584,35 +584,23 @@ 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);
$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);
foreach($logs as $logItem)
{
if(!empty($designs[$logItem->revision]))
$logItem->relationFieldTips = '';
foreach(array('designs' => 'design', 'stroies' => 'story', 'tasks' => 'task' , 'bugs' => 'bug') as $fieldType=>$moduleName)
{
foreach($designs[$logItem->revision] as $item) $item->url = !empty($item->id) ? $this->createLink('design', 'view', 'designID=' . $item->id) : '';
$logItem->relationField['designs'] = $designs[$logItem->revision];
}
if(!empty($stories[$logItem->revision]))
{
foreach($stories[$logItem->revision] as $item) $item->url = !empty($item->id) ? $this->createLink('story', 'view', 'storyID=' . $item->id) : '';
$logItem->relationField['stroies'] = $stories[$logItem->revision];
}
if(!empty($tasks[$logItem->revision]))
{
foreach($tasks[$logItem->revision] as $item) $item->url = !empty($item->id) ? $this->createLink('task', 'view', 'taskID=' . $item->id) : '';
$logItem->relationField['tasks'] = $tasks[$logItem->revision];
}
if(!empty($bugs[$logItem->revision]))
{
foreach($bugs[$logItem->revision] as $item) $item->url = !empty($item->id) ? $this->createLink('bug', 'view', 'bugID=' . $item->id) : '';
$logItem->relationField['bugs'] = $bugs[$logItem->revision];
if(!empty(${$fieldType}[$logItem->revision]))
{
$fieldCommits = ${$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];
}
}
}
module/repo/css/log.ui.css
+2
View File
@@ -1,3 +1,5 @@
#featureBar .nav .icon-angle-right {color: #ffffff;}
.repo-select > div {display: inline-block;}
.dtable-cell-html {width: 100%;}
.relationsField {overflow: hidden; white-space: nowrap; text-overflow: ellipsis;}
.relationsField > button{ height: 18px;}
module/repo/ui/log.html.php
+1 -1
View File
@@ -53,8 +53,8 @@ if($fileName) $breadcrumbItems[] = h::span($fileName);
foreach($logs as $log)
{
$log->revision = substr($log->revision, 0, 10);
$log->relations = '<div class="relationsField">';
if (empty($log->relationField)) continue;
$log->relations = '<div class="relationsField" title="' . $log->relationFieldTips . '">';
foreach (array('stroies' => 'story', 'designs' => 'design', 'tasks' => 'task', 'bugs' => 'bug') as $key => $value)
{
if (!empty($log->relationField[$key]))