* Adjust code

This commit is contained in:
zenggang
2023-08-28 02:55:15 +00:00
parent f6eabf8185
commit 45a0548b0a
+3 -2
View File
@@ -16,10 +16,11 @@ foreach($bugs as $bug)
$lines = explode(',', trim($bug->lines, ','));
$bug->entry = $repo->name . '/' . $this->repo->decodePath($bug->entry);
$encodeEntry = urlencode($bug->entry);
if(empty($bug->v1))
{
$revision = $repo->SCM != 'Subversion' ? $this->repo->getGitRevisionName($bug->v2, zget($historys, $bug->v2)) : $bug->v2;
$bug->link = $this->repo->createLink('view', "repoID=$repoID&objectID=0&entry={$bug->entry}&revision={$bug->v2}") . "#L$lines[0]";
$bug->link = $this->repo->createLink('view', "repoID=$repoID&objectID=0&entry={$encodeEntry}&revision={$bug->v2}") . "#L$lines[0]";
}
else
{
@@ -27,7 +28,7 @@ foreach($bugs as $bug)
$revision .= ' : ';
$revision .= $repo->SCM != 'Subversion' ? substr($bug->v2, 0, 10) : $bug->v2;
if($repo->SCM != 'Subversion') $revision .= ' (' . zget($historys, $bug->v1) . ' : ' . zget($historys, $bug->v2) . ')';
$bug->link = $this->repo->createLink('diff', "repoID=$repoID&objectID=0&entry={$bug->entry}&oldRevision={$bug->v1}&newRevision={$bug->v2}") . "#L$lines[0]";
$bug->link = $this->repo->createLink('diff', "repoID=$repoID&objectID=0&entry={$encodeEntry}&oldRevision={$bug->v1}&newRevision={$bug->v2}") . "#L$lines[0]";
}
}
$bugs = initTableData($bugs, $config->repo->reviewDtable->fieldList);