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

Merge branch 'devops24_50667' into 'devops24'

Browse Source 
Finish task#50667,50675

See merge request easycorp/zentaopms!2349
This commit is contained in:
李玉春
2022-03-18 01:03:32 +00:00
parent b6db2c5c55 dae974455f
commit 307c410724
4 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/repo/control.php
+1 -12
View File
@@ -301,7 +301,6 @@ class repo extends control
$this->app->loadClass('pager', $static = true);
$pager = new pager(0, 8, 1);
$commiters = $this->loadModel('user')->getCommiters();
$logType = 'file';
$revisions = $this->repo->getCommits($repo, '/' . $entry, 'HEAD', $logType, $pager);
@@ -310,7 +309,6 @@ class repo extends control
{
if($revision == 'HEAD' and $i == 0) $revision = $log->revision;
if($revision == $log->revision) $revisionName = strpos($repo->SCM, 'Git') !== false ? $this->repo->getGitRevisionName($log->revision, $log->commit) : $log->revision;
$log->committer = zget($commiters, $log->committer, $log->committer);
$i++;
}
if(!isset($revisionName))
@@ -477,11 +475,6 @@ class repo extends control
/* Synchronous commit only in root path. */
if(strpos($repo->SCM, 'Git') !== false and empty($path) and $infos and empty($revisions)) $this->locate($this->repo->createLink('showSyncCommit', "repoID=$repoID&objectID=$objectID&branch=" . base64_encode($this->cookie->repoBranch)));
/* Set committers. */
$commiters = $this->loadModel('user')->getCommiters();
foreach($infos as $info) $info->committer = zget($commiters, $info->account, $info->account);
foreach($revisions as $log) $log->committer = zget($commiters, $log->committer, $log->committer);
$this->view->title = $this->lang->repo->common;
$this->view->repo = $repo;
$this->view->repos = $this->repos;
@@ -539,9 +532,7 @@ class repo extends control
$this->scm->setEngine($repo);
$info = $this->scm->info($entry, $revision);
$logs = $this->repo->getCommits($repo, $entry, $revision, $type, $pager);
$commiters = $this->loadModel('user')->getCommiters();
foreach($logs as $log) $log->committer = zget($commiters, $log->committer, $log->committer);
$logs = $this->repo->getCommits($repo, $entry, $revision, $type, $pager);
$this->view->repo = $repo;
$this->view->title = $this->lang->repo->common;
@@ -1084,9 +1075,7 @@ class repo extends control
$repo = $this->repo->getRepoByID($repoID);
$path = $this->repo->decodePath($path);
$commiters = $this->loadModel('user')->getCommiters();
$revisions = $this->repo->getCommits($repo, $path, 'HEAD', $type, $pager);
foreach($revisions as $revision) $revision->committer = zget($commiters, $revision->committer, $revision->committer);
$this->view->repo = $this->repo->getRepoByID($repoID);
$this->view->revisions = $revisions;
module/repo/model.php
+5
View File
@@ -1545,6 +1545,11 @@ class repoModel extends model
*/
public function saveAction2PMS($objects, $log, $repoRoot = '', $encodings = 'utf-8', $scm = 'svn', $gitlabAccountPairs = array())
{
if(empty($gitlabAccountPairs))
{
$commiters = $this->loadModel('user')->getCommiters('account');
$log->author = zget($commiters, $log->author);
}
$log->author = isset($gitlabAccountPairs[$log->author]) ? $gitlabAccountPairs[$log->author] : $log->author;
if(isset($this->app->user))
module/repo/view/browse.html.php
+1 -1
View File
@@ -91,7 +91,7 @@
</td>
<td align='center'><?php echo $repo->SCM == 'Subversion' ? $info->revision : substr($info->revision, 0, 10);?></td>
<td><?php echo substr($info->date, 0, 10)?></td>
<td><?php echo $info->committer?></td>
<td><?php echo $info->account?></td>
<?php $comment = htmlSpecialString($info->comment, ENT_QUOTES);?>
<td class='comment' title='<?php echo $comment?>'><?php echo $comment?></td>
</tr>
module/user/model.php
+3 -2
View File
@@ -158,10 +158,11 @@ class userModel extends model
/**
* Get commiters from the user table.
*
* @param string $field
* @access public
* @return array
*/
public function getCommiters()
public function getCommiters($field = 'realname')
{
$rawCommiters = $this->dao->select('commiter, account, realname')->from(TABLE_USER)->where('commiter')->ne('')->fetchAll();
if(!$rawCommiters) return array();
@@ -172,7 +173,7 @@ class userModel extends model
$userCommiters = explode(',', $commiter->commiter);
foreach($userCommiters as $userCommiter)
{
$commiters[$userCommiter] = $commiter->realname ? $commiter->realname : $commiter->account;
$commiters[$userCommiter] = $commiter->$field ? $commiter->$field : $commiter->account;
}
}