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

* change comment to commit.

Browse Source
This commit is contained in:
wangyidong
2020-03-06 18:27:21 +08:00
parent 14bb491ce5
commit a694c8493f
12 changed files with 61 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update12.0.1.sql
+1
View File
@@ -76,6 +76,7 @@ UPDATE `zt_webhook` SET `type` = 'dinggroup' WHERE `type` = 'dingding';
UPDATE `zt_webhook` SET `type` = 'dinguser' WHERE `type` = 'dingapi';
UPDATE `zt_webhook` SET `type` = 'wechatgroup' WHERE `type` = 'weixin';
UPDATE `zt_grouppriv` SET `method` = 'edit' WHERE `module` = 'repo' AND `method` = 'settings';
UPDATE `zt_grouppriv` SET `method` = 'showsynccommit' WHERE `module` = 'repo' AND `method` = 'showsynccomment';
ALTER TABLE `zt_compile`
CHANGE `cijob` `integration` mediumint(8) unsigned NOT NULL AFTER `name`,
module/git/model.php
+6 -6
View File
@@ -71,9 +71,9 @@ class gitModel extends model
$this->loadModel('compile');
/* Get commit triggerType jobs by repoIdList. */
$commitJobs = $this->loadModel('job')->getListByTriggerType('commit', array_keys($this->repos));
$commitGroup = array();
foreach($commitJobs as $job) $commitGroup[$job->repo][$job->id] = $job;
$commentJobs = $this->loadModel('job')->getListByTriggerType('commit', array_keys($this->repos));
$commentGroup = array();
foreach($commentJobs as $job) $commentGroup[$job->repo][$job->id] = $job;
/* Get tag triggerType jobs by repoIdList. */
$tagJobs = $this->job->getListByTriggerType('tag', array_keys($this->repos));
@@ -93,13 +93,13 @@ class gitModel extends model
$this->printLog("get this repo logs.");
$lastInDB = $this->repo->getLatestComment($repoID);
$lastInDB = $this->repo->getLatestCommit($repoID);
/* Ignore unsynced branch. */
if(empty($lastInDB)) continue;
$commits = $repo->commits;
$version = $lastInDB->commit;
$logs = $this->repo->getUnsyncLogs($repo);
$logs = $this->repo->getUnsyncCommits($repo);
$objects = array();
if(!empty($logs))
{
@@ -126,7 +126,7 @@ class gitModel extends model
}
/* Create compile by comment. */
$jobs = zget($commitGroup, $repoID, array());
$jobs = zget($commentGroup, $repoID, array());
foreach($jobs as $job)
{
foreach(explode(',', $job->comment) as $comment)
module/group/lang/resource.php
+12 -12
View File
@@ -681,18 +681,18 @@ $lang->caselib->methodOrder[40] = 'exportTemplet';
$lang->caselib->methodOrder[45] = 'import';
$lang->caselib->methodOrder[50] = 'showImport';
$lang->resource->repo = new stdclass();
$lang->resource->repo->browse = 'browse';
$lang->resource->repo->view = 'view';
$lang->resource->repo->log = 'log';
$lang->resource->repo->revision = 'revisionAction';
$lang->resource->repo->blame = 'blameAction';
$lang->resource->repo->create = 'createAction';
$lang->resource->repo->edit = 'editAction';
$lang->resource->repo->delete = 'delete';
$lang->resource->repo->showSyncComment = 'showSyncComment';
$lang->resource->repo->diff = 'diffAction';
$lang->resource->repo->download = 'download';
$lang->resource->repo = new stdclass();
$lang->resource->repo->browse = 'browse';
$lang->resource->repo->view = 'view';
$lang->resource->repo->log = 'log';
$lang->resource->repo->revision = 'revisionAction';
$lang->resource->repo->blame = 'blameAction';
$lang->resource->repo->create = 'createAction';
$lang->resource->repo->edit = 'editAction';
$lang->resource->repo->delete = 'delete';
$lang->resource->repo->showSyncCommit = 'showSyncCommit';
$lang->resource->repo->diff = 'diffAction';
$lang->resource->repo->download = 'download';
/* Doc. */
$lang->resource->doc = new stdclass();
module/repo/control.php
+17 -17
View File
@@ -81,7 +81,7 @@ class repo extends control
if(dao::isError()) die(js::error(dao::getError()));
$link = $this->repo->createLink('showSyncComment', "repoID=$repoID");
$link = $this->repo->createLink('showSyncCommit', "repoID=$repoID");
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $link));
}
@@ -114,7 +114,7 @@ class repo extends control
if(dao::isError()) die(js::error(dao::getError()));
if(!$noNeedSync)
{
$link = $this->repo->createLink('showSyncComment', "repoID=$repoID");
$link = $this->repo->createLink('showSyncCommit', "repoID=$repoID");
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $link));
}
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('maintain')));
@@ -209,7 +209,7 @@ class repo extends control
$commiters = $this->loadModel('user')->getCommiters();
$logType = 'file';
$revisions = $this->repo->getLogs($repo, '/' . $entry, 'HEAD', $logType, $pager);
$revisions = $this->repo->getCommits($repo, '/' . $entry, 'HEAD', $logType, $pager);
$i = 0;
foreach($revisions as $log)
@@ -269,7 +269,7 @@ class repo extends control
if($repoID == 0) $repoID = $this->session->repoID;
$repo = $this->repo->getRepoByID($repoID);
if(!$repo->synced) $this->locate($this->repo->createLink('showSyncComment', "repoID=$repoID"));
if(!$repo->synced) $this->locate($this->repo->createLink('showSyncCommit', "repoID=$repoID"));
$path = $this->repo->decodePath($path);
$cacheFile = $this->repo->getCacheFile($repoID, $path, $revision);
@@ -315,8 +315,8 @@ class repo extends control
if($this->cookie->repoRefresh) setcookie('repoRefresh', 0, 0, $this->config->webRoot);
$logType = 'dir';
$revisions = $this->repo->getLogs($repo, $path, $revision, $logType, $pager);
if($repo->SCM == 'Git' and $infos and empty($revisions)) $this->locate($this->repo->createLink('showSyncComment', "repoID=$repoID&branch={$this->cookie->repoBranch}"));
$revisions = $this->repo->getCommits($repo, $path, $revision, $logType, $pager);
if($repo->SCM == 'Git' and $infos and empty($revisions)) $this->locate($this->repo->createLink('showSyncCommit', "repoID=$repoID&branch={$this->cookie->repoBranch}"));
$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);
@@ -365,7 +365,7 @@ class repo extends control
$this->scm->setEngine($repo);
$info = $this->scm->info($entry, $revision);
$logs = $this->repo->getLogs($repo, $entry, $revision, $type, $pager);
$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);
@@ -673,15 +673,15 @@ class repo extends control
* @access public
* @return void
*/
public function showSyncComment($repoID = 0, $branch = '')
public function showSyncCommit($repoID = 0, $branch = '')
{
$this->repo->setMenu($this->repos, $repoID);
if($repoID == 0) $repoID = $this->session->repoID;
$this->view->title = $this->lang->repo->common . $this->lang->colon . $this->lang->repo->showSyncComment;
$this->view->position[] = $this->lang->repo->showSyncComment;
$this->view->title = $this->lang->repo->common . $this->lang->colon . $this->lang->repo->showSyncCommit;
$this->view->position[] = $this->lang->repo->showSyncCommit;
$latestInDB = $this->repo->getLatestComment($repoID);
$latestInDB = $this->repo->getLatestCommit($repoID);
$this->view->version = $latestInDB ? (int)$latestInDB->commit : 1;
$this->view->repoID = $repoID;
$this->view->branch = $branch;
@@ -696,7 +696,7 @@ class repo extends control
* @access public
* @return void
*/
public function ajaxSyncComment($repoID = 0, $type = 'batch')
public function ajaxSyncCommit($repoID = 0, $type = 'batch')
{
set_time_limit(0);
$repo = $this->repo->getRepoByID($repoID);
@@ -757,7 +757,7 @@ class repo extends control
{
if($repo->SCM == 'Git')
{
if($branchID) $this->repo->saveExistsLogBranch($repo->id, $branchID);
if($branchID) $this->repo->saveExistCommits4Branch($repo->id, $branchID);
$branchID = reset($branches);
setcookie("syncBranch", $branchID, 0, $this->config->webRoot);
@@ -785,7 +785,7 @@ class repo extends control
* @access public
* @return void
*/
public function ajaxSyncBranchComment($repoID = 0, $branch = '')
public function ajaxSyncBranchCommit($repoID = 0, $branch = '')
{
set_time_limit(0);
$repo = $this->repo->getRepoByID($repoID);
@@ -813,7 +813,7 @@ class repo extends control
$commitCount = $this->repo->saveCommit($repoID, $logs, $version, $branch);
if(empty($commitCount))
{
if($branch) $this->repo->saveExistsLogBranch($repo->id, $branch);
if($branch) $this->repo->saveExistCommits4Branch($repo->id, $branch);
setcookie("syncBranch", $branch, 0, $this->config->webRoot);
$this->repo->markSynced($repoID);
@@ -836,7 +836,7 @@ class repo extends control
* @access public
* @return void
*/
public function ajaxSideLogs($repoID, $path, $type = 'dir', $recTotal = 0, $recPerPage = 8, $pageID = 1)
public function ajaxSideCommits($repoID, $path, $type = 'dir', $recTotal = 0, $recPerPage = 8, $pageID = 1)
{
if($this->get->path) $path = $this->get->path;
$this->app->loadClass('pager', $static = true);
@@ -845,7 +845,7 @@ class repo extends control
$repo = $this->repo->getRepoByID($repoID);
$path = $this->repo->decodePath($path);
$commiters = $this->loadModel('user')->getCommiters();
$revisions = $this->repo->getLogs($repo, $path, 'HEAD', $type, $pager);
$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);
module/repo/lang/en.php
+2 -2
View File
@@ -7,8 +7,8 @@ $lang->repo->createAction = 'Create Repo';
$lang->repo->edit = 'Edit';
$lang->repo->editAction = 'Edit Repo';
$lang->repo->delete = 'Delete Repo';
$lang->repo->showSyncComment = 'Display Synchronization';
$lang->repo->ajaxSyncComment = 'Interface: Ajax Sync Note';
$lang->repo->showSyncCommit = 'Display Synchronization';
$lang->repo->ajaxSyncCommit = 'Interface: Ajax Sync Note';
$lang->repo->setRules = 'Set rules';
$lang->repo->download = 'Download File';
$lang->repo->downloadDiff = 'Download Diff';
module/repo/lang/zh-cn.php
+2 -2
View File
@@ -7,8 +7,8 @@ $lang->repo->createAction = '创建版本库';
$lang->repo->edit = '编辑';
$lang->repo->editAction = '编辑版本库';
$lang->repo->delete = '删除版本库';
$lang->repo->showSyncComment = '显示同步进度';
$lang->repo->ajaxSyncComment = '接口：AJAX同步注释';
$lang->repo->showSyncCommit = '显示同步进度';
$lang->repo->ajaxSyncCommit = '接口：AJAX同步注释';
$lang->repo->setRules = '指令配置';
$lang->repo->download = '下载';
$lang->repo->downloadDiff = '下载Diff';
module/repo/model.php
+8 -8
View File
@@ -330,7 +330,7 @@ class repoModel extends model
}
/**
* Get logs.
* Get commits.
*
* @param object $repo
* @param string $entry
@@ -340,7 +340,7 @@ class repoModel extends model
* @access public
* @return array
*/
public function getLogs($repo, $entry, $revision = 'HEAD', $type = 'dir', $pager = null)
public function getCommits($repo, $entry, $revision = 'HEAD', $type = 'dir', $pager = null)
{
$entry = ltrim($entry, '/');
$entry = $repo->prefix . (empty($entry) ? '' : '/' . $entry);
@@ -393,13 +393,13 @@ class repoModel extends model
}
/**
* Get latest comment.
* Get latest commit.
*
* @param int $repoID
* @access public
* @return object
*/
public function getLatestComment($repoID)
public function getLatestCommit($repoID)
{
$count = $this->dao->select('count(DISTINCT t1.id) as count')->from(TABLE_REPOHISTORY)->alias('t1')
->leftJoin(TABLE_REPOBRANCH)->alias('t2')->on('t1.id=t2.revision')
@@ -603,7 +603,7 @@ class repoModel extends model
* @access public
* @return void
*/
public function saveExistsLogBranch($repoID, $branch)
public function saveExistCommits4Branch($repoID, $branch)
{
$lastBranchLog = $this->dao->select('t1.time')->from(TABLE_REPOHISTORY)->alias('t1')
->leftJoin(TABLE_REPOBRANCH)->alias('t2')->on('t1.id=t2.revision')
@@ -633,16 +633,16 @@ class repoModel extends model
}
/**
* Get unsync logs
* Get unsync commits
*
* @param object $repo
* @access public
* @return array
*/
public function getUnsyncLogs($repo)
public function getUnsyncCommits($repo)
{
$repoID = $repo->id;
$lastInDB = $this->getLatestComment($repoID);
$lastInDB = $this->getLatestCommit($repoID);
$scm = $this->app->loadClass('scm');
$scm->setEngine($repo);
module/repo/view/ajaxsidelogs.html.php → module/repo/view/ajaxsidecommits.html.php
+2 -2
View File
@@ -58,8 +58,8 @@ if(isset($entry)) $pathInfo .= '&type=file';
$prePage = $pager->pageID == 1 ? 1 : $pager->pageID - 1;
$nextPage = $pager->pageID == $pager->pageTotal ? $pager->pageID : $pager->pageID + 1;
$params = "repoID=$repoID&path=&type=$logType&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";
$preLink = $this->repo->createLink('ajaxSideLogs', "$params&pageID=$prePage", "path=" . $this->repo->encodePath($path));
$nextLink = $this->repo->createLink('ajaxSideLogs', "$params&pageID=$nextPage", "path=" . $this->repo->encodePath($path));
$preLink = $this->repo->createLink('ajaxSideCommits', "$params&pageID=$prePage", "path=" . $this->repo->encodePath($path));
$nextLink = $this->repo->createLink('ajaxSideCommits', "$params&pageID=$nextPage", "path=" . $this->repo->encodePath($path));
echo html::a($preLink, "<i class='icon icon-angle-left'></i>", '', "class='ajaxPager btn" . ($prePage == $pager->pageID ? ' disabled' : '') . "'");
echo html::a($nextLink, "<i class='icon icon-angle-right'></i>", '', "class='ajaxPager btn" . ($nextPage == $pager->pageID ? ' disabled' : '') . "'");
?>
module/repo/view/browse.html.php
+1 -1
View File
@@ -73,7 +73,7 @@
</div>
<div class="side-col" id="sidebar">
<div class="sidebar-toggle"><i class="icon icon-angle-right"></i></div>
<div class='side-body'><?php include 'ajaxsidelogs.html.php';?></div>
<div class='side-body'><?php include 'ajaxsidecommits.html.php';?></div>
</div>
</div>
<?php include '../../common/view/footer.html.php';?>
module/repo/view/showsynccomment.html.php → module/repo/view/showsynccommit.html.php
+3 -3
View File
@@ -1,6 +1,6 @@
<?php
/**
* The showSyncComment view file of repo module of ZenTaoPMS.
* The showSyncCommit view file of repo module of ZenTaoPMS.
*
* @copyright Copyright 2009-2010 QingDao Nature Easy Soft Network Technology Co,LTD (www.cnezsoft.com)
* @license LGPL (http://www.gnu.org/licenses/lgpl.html)
@@ -26,9 +26,9 @@
<script language='Javascript'>
$(function(){
<?php if(empty($branch)):?>
var link = createLink('repo', 'ajaxSyncComment', "repoID=<?php echo $repoID?>");
var link = createLink('repo', 'ajaxSyncCommit', "repoID=<?php echo $repoID?>");
<?php else:?>
var link = createLink('repo', 'ajaxSyncBranchComment', "repoID=<?php echo $repoID?>&branch=<?php echo $branch;?>");
var link = createLink('repo', 'ajaxSyncBranchCommit', "repoID=<?php echo $repoID?>&branch=<?php echo $branch;?>");
<?php endif;?>
function syncComments()
{
module/repo/view/view.html.php
+1 -1
View File
@@ -82,7 +82,7 @@ $version = " <span class=\"label label-info\">$revisionName</span>";
<?php if(!isonlybody()):?>
<div class="side-col" id="sidebar">
<div class="sidebar-toggle"><i class="icon icon-angle-right"></i></div>
<div class='side-body'><?php include 'ajaxsidelogs.html.php';?></div>
<div class='side-body'><?php include 'ajaxsidecommits.html.php';?></div>
</div>
<?php endif;?>
<?php if(!isonlybody()):?>
module/svn/model.php
+6 -6
View File
@@ -71,9 +71,9 @@ class svnModel extends model
$this->loadModel('compile');
/* Get commit triggerType jobs by repoIdList */
$commitJobs = $this->loadModel('job')->getListByTriggerType('commit', array_keys($this->repos));
$commitGroup = array();
foreach($commitJobs as $job) $commitGroup[$job->repo][$job->id] = $job;
$commentJobs = $this->loadModel('job')->getListByTriggerType('commit', array_keys($this->repos));
$commentGroup = array();
foreach($commentJobs as $job) $commentGroup[$job->repo][$job->id] = $job;
/* Get tag triggerType jobs by repoIdList */
$tagJobs = $this->job->getListByTriggerType('tag', array_keys($this->repos));
@@ -87,12 +87,12 @@ class svnModel extends model
if(!$this->setRepo($repo)) return false;
$this->printLog("get this repo logs.");
$lastInDB = $this->repo->getLatestComment($repoID);
$lastInDB = $this->repo->getLatestCommit($repoID);
/* Ignore unsynced repo. */
if(empty($lastInDB)) continue;
$version = $lastInDB->commit;
$logs = $this->repo->getUnsyncLogs($repo);
$logs = $this->repo->getUnsyncCommits($repo);
$objects = array();
if(!empty($logs))
{
@@ -118,7 +118,7 @@ class svnModel extends model
}
/* Create compile by comment. */
$jobs = zget($commitGroup, $repoID, array());
$jobs = zget($commentGroup, $repoID, array());
foreach($jobs as $job)
{
foreach(explode(',', $job->comment) as $comment)