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

* Fix bug #26413.

Browse Source
This commit is contained in:
liyuchun
2022-08-16 08:53:41 +08:00
parent af9287a7d7
commit 6a4299917d
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/model.php
+3 -3
View File
@@ -1733,10 +1733,10 @@ class mrModel extends model
}
else
{
$projectID = $MR->projectID;
$projectID = $MR->targetProject;
$MRID = $MR->mriid;
if($host->type == 'gitlab') $url = sprintf($this->loadModel('gitlab')->getApiRoot($this->hostID), "/projects/$projectID/merge_requests/$MRID/commits");
if($host->type == 'gitea') $url = sprintf($this->loadModel('gitea')->getApiRoot($this->hostID), "/repos/$projectID/pulls/$MRID/commits");
if($host->type == 'gitlab') $url = sprintf($this->loadModel('gitlab')->getApiRoot($MR->hostID), "/projects/$projectID/merge_requests/$MRID/commits");
if($host->type == 'gitea') $url = sprintf($this->loadModel('gitea')->getApiRoot($MR->hostID), "/repos/$projectID/pulls/$MRID/commits");
return json_decode(commonModel::http($url));
}
}
module/mr/view/link.html.php
+4 -4
View File
@@ -89,7 +89,7 @@
?>
<?php foreach($stories as $story):?>
<?php
$viewLink = $this->createLink('story', 'view', "storyID=$story->id");
$viewLink = $this->createLink('story', 'view', "storyID=$story->id", '', true);
$totalEstimate += $story->estimate;
?>
<tr data-id='<?php echo $story->id;?>'>
@@ -102,7 +102,7 @@
<td class='text-left nobr' title='<?php echo $story->title?>'>
<?php
if($story->parent > 0) echo "<span class='label label-badge label-light' title={$lang->story->children}>{$lang->story->childrenAB}</span>";
echo html::a($viewLink , $story->title);
echo html::a($viewLink , $story->title, '', 'class="iframe"');
?>
</td>
<td><?php echo zget($users, $story->openedBy);?></td>
@@ -168,7 +168,7 @@
<?php printf('%03d', $bug->id);?>
</td>
<td><span class='label-pri label-pri-<?php echo $bug->pri;?>' title='<?php echo zget($lang->bug->priList, $bug->pri, $bug->pri);?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri);?></span></td>
<td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></td>
<td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id", '', true), $bug->title, '', 'class="iframe"');?></td>
<td><?php echo zget($users, $bug->openedBy);?></td>
<td><?php echo zget($users, $bug->assignedTo);?></td>
<td>
@@ -230,7 +230,7 @@
<?php printf('%03d', $task->id);?>
</td>
<td><span class='label-pri label-pri-<?php echo $task->pri;?>' title='<?php echo zget($lang->task->priList, $task->pri, $task->pri);?>'><?php echo zget($lang->task->priList, $task->pri, $task->pri);?></span></td>
<td class='text-left nobr' title='<?php echo $task->name?>'><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), $task->name);?></td>
<td class='text-left nobr' title='<?php echo $task->name?>'><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', true), $task->name, '', 'class="iframe"');?></td>
<td><?php echo zget($users, $task->finishedBy);?></td>
<td><?php echo zget($users, $task->assignedTo);?></td>
<td>