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

* Add diff page.

Browse Source
This commit is contained in:
Guan Xiying
2021-08-25 10:36:18 +08:00
parent 22d79c2681
commit eef945755f
3 changed files with 168 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/model.php
+19 -17
View File
@@ -348,24 +348,26 @@ class mrModel extends model
* @access public
* @return object
*/
public function apiGetDiffVersions($MR)
public function getDiffs($MR)
{
$url = sprintf($this->gitlab->getApiRoot($MR->gitlabID), "/projects/{$MR->sourceProject}/merge_requests/$MR->mriid/versions");
return json_decode(commonModel::http($url));
}
$gitlab = $this->gitlab->getByID($MR->gitlabID);
$fromProject = $MR->sourceProject;
$toProject = $MR->targetProject;
/**
* Get single diff version by API.
*
* @docs https://docs.gitlab.com/ee/api/merge_requests.html#get-a-single-mr-diff-version
* @param object $MR
* @param int $versionID
* @access public
* @return object
*/
public function apiGetSingleDiffVersion($MR, $versionID)
{
$url = sprintf($this->gitlab->getApiRoot($MR->gitlabID), "/projects/{$MR->sourceProject}/merge_requests/{$MR->mriid}/versions/$versionID");
return json_decode(commonModel::http($url));
$this->loadModel('repo');
$repo = new stdclass;
$repo->SCM = 'GitLab';
$repo->gitlab = $gitlab->id;
$repo->project = $toProject;
$repo->path = sprintf($this->config->repo->gitlab->apiPath, $gitlab->url, $toProject);
$repo->client = $gitlab->url;
$repo->password = $gitlab->token;
$scm = $this->app->loadClass('scm');
$scm->setEngine($repo);
$encoding = empty($encoding) ? $repo->encoding : $encoding;
$encoding = strtolower(str_replace('_', '-', $encoding));
return $scm->diff('', $fromProject, $toProject, $parse = true, $fromProject);
}
}
module/mr/view/browse.html.php
+2 -1
View File
@@ -44,8 +44,9 @@
<td class='text'><?php echo zget($lang->mr->mergeStatusList, $mr->mergeStatus);?></td>
<td class='text-left c-actions'>
<?php
common::printLink('mr', 'view', "mr={$mr->id}", '<i class="icon icon-review"></i>', '', "title='{$lang->mr->list}' class='btn btn-info'");
common::printLink('mr', 'view', "mr={$mr->id}", '<i class="icon icon-eye"></i>', '', "title='{$lang->mr->view}' class='btn btn-info'");
common::printLink('mr', 'edit', "mrID=$mr->id", '<i class="icon icon-edit"></i>', '', "title='{$lang->mr->edit}' class='btn btn-info'");
common::printLink('mr', 'diff', "mr={$mr->id}", '<i class="icon icon-review"></i>', '', "title='{$lang->mr->diff}' class='btn btn-info'");
if(common::hasPriv('mr', 'delete')) echo html::a($this->createLink('mr', 'delete', "id=$mr->id"), '<i class="icon-trash"></i>', 'hiddenwin', "title='{$lang->mr->delete}' class='btn'");
?>
</td>
module/mr/view/diff.html.php
+147
View File
@@ -0,0 +1,147 @@
<?php
/**
* The diff view file of repo module of ZenTaoPMS.
*
* @copyright Copyright 2009-2012 青岛易软天创网络科技有限公司 (QingDao Nature Easy Soft Network Technology Co,LTD www.cnezsoft.com)
* @author Wang Yidong, Zhu Jinyong
* @package repo
* @version $Id: browse.html.php $
*/
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/form.html.php';?>
<?php if(!isonlybody()):?>
<div id='mainMenu' class='clearfix'>
<div class='btn-toolbar pull-left'>
<?php
$backURI = $this->session->repoView ? $this->session->repoView : $this->session->repoList;
if($backURI)
{
echo html::a($backURI, "<i class='icon icon-back icon-sm'></i> " . $lang->goback, '', "class='btn btn-link' data-app='{$app->openApp}'");
}
else
{
echo html::backButton("<i class='icon icon-back icon-sm'></i> " . $lang->goback, '', "btn btn-link");
}
?>
<div class="divider"></div>
</div>
</div>
<?php endif;?>
<div class="repo panel">
<div class='panel-heading'>
<form method='post'>
<div class='btn-group pull-right'>
<?php echo html::commonButton($lang->repo->viewDiffList['inline'], "id='inline'", $arrange == 'inline' ? 'active btn btn-sm' : 'btn btn-sm')?>
<?php echo html::commonButton($lang->repo->viewDiffList['appose'], "id='appose'", $arrange == 'appose' ? 'active btn btn-sm' : 'btn btn-sm')?>
</div>
<div class='btn-toolbar'>
<div class='btn-group'>
<div class='btn-group'>
<?php echo html::commonButton(zget($lang->repo->encodingList, $encoding, $lang->repo->encoding) . "<span class='caret'></span>", "data-toggle='dropdown'", 'btn dropdown-toggle btn-sm')?>
<ul class='dropdown-menu' role='menu'>
<?php foreach($lang->repo->encodingList as $key => $val):?>
<li><?php echo html::a('javascript:changeEncoding("'. $key . '")', $val)?></li>
<?php endforeach;?>
</ul>
</div>
</div>
</div>
<?php echo html::hidden('arrange', $arrange) . html::hidden('encoding', $encoding) . html::hidden('revision[]', $newRevision) . html::hidden('revision[]', $oldRevision)?>
</form>
</div>
<?php foreach($diffs as $diffFile):?>
<div class='repoCode'>
<table class='table diff' id='diff'>
<caption><?php echo $diffFile->fileName;?></caption>
<?php if(empty($diffFile->contents)) continue;?>
<?php foreach($diffFile->contents as $content):?>
<?php
$oldCurrentLine = $content->oldStartLine;
$newCurrentLine = $content->newStartLine;
?>
<?php if(!in_array($oldCurrentLine, array('0', '1')) and !in_array($newCurrentLine, array('0', '1'))):?>
<tr data-line='<?php echo $newCurrentLine ?>' class='empty'>
<th class='w-num text-center'>...</th>
<?php if($arrange == 'appose'):?>
<td class='none code'></td>
<?php endif;?>
<th class='w-num text-center'>...</th>
<td class='none code'></td>
</tr>
<?php endif?>
<?php if($arrange == 'inline'):?>
<?php foreach($content->lines as $line):?>
<tr data-line='<?php echo $line->newlc ?>'>
<th class='w-num text-right'><?php if($line->type != 'new') echo $line->oldlc?></th>
<th class='w-num text-left'><?php if($line->type != 'old') echo $line->newlc?></th>
<td class='line-<?php echo $line->type?> code'><?php
$line->line = $repo->SCM == 'Subversion' ? htmlspecialchars($line->line) : $line->line;
echo $line->type == 'old' ? preg_replace('/^\-/', '&ndash;', $line->line) : ($line->type == 'new' ? $line->line : ' ' . $line->line);
?></td>
</tr>
<?php endforeach;?>
<?php else:?>
<?php foreach($content->lines as $line):?>
<tr data-line='<?php echo $line->newlc ?>'>
<?php
if($line->type == 'old')
{
$oldlc = $line->oldlc;
$newlc = '';
if(isset($content->new[$oldlc]))
{
$newlc = $line->oldlc;
$line->type = 'custom';
}
}
else
{
$oldlc = $line->oldlc;
$newlc = $line->newlc;
if(!isset($content->new[$newlc])) continue;
}
?>
<th class='w-num text-right'><?php echo $oldlc?></th>
<td class='w-code line-<?php if($line->type != 'new')echo $line->type?> <?php if($line->type == 'custom') echo "line-old"?> code'><?php
if(!isset($content->old[$oldlc])) $content->old[$oldlc] = '';
$content->old[$oldlc] = $repo->SCM == 'Subversion' ? htmlspecialchars($content->old[$oldlc]) : $content->old[$oldlc];
if(!empty($oldlc)) echo $line->type != 'all' ? preg_replace('/^\-/', '&ndash;', $content->old[$oldlc]) : ' ' . $content->old[$oldlc];
?></td>
<th class='w-num text-right'><?php echo $newlc?></th>
<td class='w-code line-<?php if($line->type != 'old') echo $line->type?> <?php if($line->type == 'custom') echo "line-new"?> code'><?php
if(!isset($content->new[$newlc])) $content->new[$newlc] = '';
$content->new[$newlc] = $repo->SCM == 'Subversion' ? htmlspecialchars($content->new[$newlc]) : $content->new[$newlc];
if(!empty($newlc)) echo $line->type != 'all' ? $content->new[$newlc] : ' ' . $content->new[$newlc];
?></td>
<?php
if(isset($content->old[$oldlc])) unset($content->old[$oldlc]);
if(isset($content->new[$newlc])) unset($content->new[$newlc]);
?>
</tr>
<?php endforeach;?>
<?php endif;?>
<?php endforeach;?>
</table>
</div>
<?php endforeach?>
</div>
<div class='revisions hidden'>
<?php
if(strpos($repo->SCM, 'Subversion') === false)
{
$oldRevision = $oldRevision == '^' ? "$newRevision" : $oldRevision;
echo " <span class='label label-info'>" . substr($oldRevision, 0, 10) . " : " . substr($newRevision, 0, 10) . ' (' . $historys[$oldRevision] . ' : ' . $historys[$newRevision] . ')</span>';
}
else
{
$oldRevision = $oldRevision == '^' ? $newRevision - 1 : $oldRevision;
echo " <span class='label label-info'>$oldRevision : $newRevision</span>";
}
?>
</div>
<form method="post" id="exchange" class="hidden">
<input type="hidden" name="revision[]" value="<?php echo $oldRevision;?>"/>
<input type="hidden" name="revision[]" value="<?php echo $newRevision;?>"/>
</form>
<?php include '../../common/view/footer.html.php';?>