From 2d9d95cc98f48db029acd5a637cef179be9ba53e Mon Sep 17 00:00:00 2001 From: dingguodong Date: Tue, 16 Nov 2021 10:46:48 +0800 Subject: [PATCH] * Correct or Optimize codes to meet code styles. --- config/filter.php | 5 +++-- db/zentao.sql | 2 +- module/gitlab/model.php | 4 ++-- module/mr/control.php | 18 +++++++-------- module/mr/js/edit.js | 41 +++++++++++++++++++--------------- module/mr/lang/en.php | 6 ++--- module/mr/lang/zh-cn.php | 6 ++--- module/mr/lang/zh-tw.php | 6 ++--- module/mr/model.php | 30 ++++++++++++------------- module/mr/view/browse.html.php | 12 +++++----- module/mr/view/create.html.php | 6 ++--- module/mr/view/diff.html.php | 2 +- module/mr/view/edit.html.php | 8 +++---- 13 files changed, 76 insertions(+), 70 deletions(-) diff --git a/config/filter.php b/config/filter.php index adc4f579e7..f00eed0bde 100644 --- a/config/filter.php +++ b/config/filter.php @@ -375,7 +375,8 @@ $filter->gitlab->importissue->get['project'] = 'int'; $filter->gitlab->importissue->get['repo'] = 'int'; $filter->mr->diff->cookie['arrange'] = 'reg::word'; -$filter->mr->browse->get['assignee'] = 'string'; -$filter->mr->browse->get['creator'] = 'string'; + +$filter->mr->browse->get['mode'] = 'string'; +$filter->mr->browse->get['param'] = 'string'; $filter->ci->checkCompileStatus->get['gitlabOnly'] = 'string'; diff --git a/db/zentao.sql b/db/zentao.sql index 6432b88a22..f7e5e8b84c 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -665,7 +665,7 @@ CREATE TABLE IF NOT EXISTS `zt_mr` ( `mergeStatus` char(30) NOT NULL, `approvalStatus` char(30) NOT NULL, `needApproved` enum('0','1') NOT NULL DEFAULT '0', - `needPassCI` enum('0','1') NOT NULL DEFAULT '0', + `needCI` enum('0','1') NOT NULL DEFAULT '0', `repoID` mediumint(8) unsigned NOT NULL, `jobID` mediumint(8) unsigned NOT NULL, `compileID` mediumint(8) unsigned NOT NULL, diff --git a/module/gitlab/model.php b/module/gitlab/model.php index ecf813d701..9a41a8372d 100644 --- a/module/gitlab/model.php +++ b/module/gitlab/model.php @@ -1053,10 +1053,10 @@ class gitlabModel extends model $hook->push_events = true; $hook->merge_requests_events = true; - /* Return a empty array if where is a existing webhook. */ + /* Return an empty array if where is one existing webhook. */ if($this->isWebhookExists($repo, $hook->url)) return array(); - $result = $this->apiCreateHook($repo->gitlab, $repo->project, $hook); + $result = $this->apiCreateHook($repo->gitlab, $repo->project, $hook); if(!empty($result->id)) return true; return false; diff --git a/module/mr/control.php b/module/mr/control.php index fd05fae1b0..86a7db6f1a 100644 --- a/module/mr/control.php +++ b/module/mr/control.php @@ -18,6 +18,8 @@ class mr extends control /** * Browse mr. * + * @param string $mode + * @param string $param * @param int $objectID * @param string $orderBy * @param int $recTotal @@ -26,14 +28,13 @@ class mr extends control * @access public * @return void */ - public function browse($browseType = 'all', $assignee = 'all', $creator = 'all', $objectID = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) + public function browse($mode = 'all', $param = 'all', $objectID = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) { - $assignee = isset($_GET['assignee']) ? $this->get->assignee : "all"; - $creator = isset($_GET['creator']) ? $this->get->creator : "all"; + $param = isset($_GET['param']) ? $this->get->param : "all"; $this->app->loadClass('pager', $static = true); $pager = new pager($recTotal, $recPerPage, $pageID); - $MRList = $this->mr->getList($browseType, $assignee, $creator, $orderBy, $pager); + $MRList = $this->mr->getList($mode, $param, $orderBy, $pager); /* Save current URI to session. */ $this->session->set('mrList', $this->app->getURI(true), 'repo'); @@ -47,9 +48,8 @@ class mr extends control $this->view->title = $this->lang->mr->common . $this->lang->colon . $this->lang->mr->browse; $this->view->MRList = $MRList; $this->view->pager = $pager; - $this->view->browseType = $browseType; - $this->view->assignee = $assignee; - $this->view->creator = $creator; + $this->view->mode = $mode; + $this->view->param = $param; $this->view->objectID = $objectID; $this->view->orderBy = $orderBy; $this->display(); @@ -231,13 +231,13 @@ class mr extends control $MR = $this->mr->getByID($MRID); /* Judge that if this MR can be accepted. */ - if(isset($MR->needPassCI) and $MR->needPassCI == '1') + if(isset($MR->needCI) and $MR->needCI == '1') { $compileStatus = empty($MR->compileID) ? 'fail' : $this->loadModel('compile')->getByID($MR->compileID)->status; if(isset($compileStatus) and $compileStatus != 'success') { - return $this->send(array('result' => 'fail', 'message' => $this->lang->mr->needPassCI, 'locate' => helper::createLink('mr', 'view', "mr={$MRID}"))); + return $this->send(array('result' => 'fail', 'message' => $this->lang->mr->needCI, 'locate' => helper::createLink('mr', 'view', "mr={$MRID}"))); } } if(isset($MR->needApproved) and $MR->needApproved == '1') diff --git a/module/mr/js/edit.js b/module/mr/js/edit.js index dbeab4b753..f24356500f 100644 --- a/module/mr/js/edit.js +++ b/module/mr/js/edit.js @@ -1,20 +1,25 @@ -$(function () { - $('#repo').change(function () { - repoID = $(this).val(); - jobUrl = createLink('mr', 'ajaxGetJobList', "repoID=" + repoID); - $.get(jobUrl, function (response) { - $('#job').html('').append(response); - $('#job').chosen().trigger("chosen:updated");; - }); - }); +$(function () + { + $('#repo').change(function () + { + repoID = $(this).val(); + jobUrl = createLink('mr', 'ajaxGetJobList', "repoID=" + repoID); + $.get(jobUrl, function (response) + { + $('#job').html('').append(response); + $('#job').chosen().trigger("chosen:updated");; + }); + }); - $('#job').change(function () { - jobID = $(this).val(); - compileUrl = createLink('mr', 'ajaxGetCompileList', "job=" + jobID); - $.get(compileUrl, function (response) { - $('#compile').html('').append(response); - $('#compile').chosen().trigger("chosen:updated");; - }); - }); + $('#job').change(function () + { + jobID = $(this).val(); + compileUrl = createLink('mr', 'ajaxGetCompileList', "job=" + jobID); + $.get(compileUrl, function (response) + { + $('#compile').html('').append(response); + $('#compile').chosen().trigger("chosen:updated");; + }); + }); -}); + }); diff --git a/module/mr/lang/en.php b/module/mr/lang/en.php index 200b7b9f00..eeb7a6dc78 100644 --- a/module/mr/lang/en.php +++ b/module/mr/lang/en.php @@ -31,13 +31,13 @@ $lang->mr->reject = 'Reject'; $lang->mr->close = 'Close'; $lang->mr->reopen = 'Reopen'; -$lang->mr->approvalResult = 'Approval result'; -$lang->mr->approvalResultList = array(); +$lang->mr->approvalResult = 'Approval result'; +$lang->mr->approvalResultList = array(); $lang->mr->approvalResultList['approve'] = 'Approve'; $lang->mr->approvalResultList['reject'] = 'Reject'; $lang->mr->needApproved = 'This MR should be approved before merge'; -$lang->mr->needPassCI = 'This MR should be passed CI before merge'; +$lang->mr->needCI = 'This MR should be passed CI before merge'; $lang->mr->repeatedOperation = 'Do not repeat operations'; diff --git a/module/mr/lang/zh-cn.php b/module/mr/lang/zh-cn.php index 61aa191efa..5a971d6bd4 100644 --- a/module/mr/lang/zh-cn.php +++ b/module/mr/lang/zh-cn.php @@ -31,13 +31,13 @@ $lang->mr->reject = '拒绝'; $lang->mr->close = '关闭'; $lang->mr->reopen = '重新打开'; -$lang->mr->approvalResult = '评审意见'; -$lang->mr->approvalResultList = array(); +$lang->mr->approvalResult = '评审意见'; +$lang->mr->approvalResultList = array(); $lang->mr->approvalResultList['approve'] = '通过'; $lang->mr->approvalResultList['reject'] = '拒绝'; $lang->mr->needApproved = '需要通过评审才能合并'; -$lang->mr->needPassCI = '需要通过构建才能合并'; +$lang->mr->needCI = '需要通过构建才能合并'; $lang->mr->repeatedOperation = '请勿重复操作'; diff --git a/module/mr/lang/zh-tw.php b/module/mr/lang/zh-tw.php index 1304da2ab9..3dd556094d 100644 --- a/module/mr/lang/zh-tw.php +++ b/module/mr/lang/zh-tw.php @@ -31,13 +31,13 @@ $lang->mr->reject = '拒絕'; $lang->mr->close = '關閉'; $lang->mr->reopen = '重新打開'; -$lang->mr->approvalResult = '評審意見'; -$lang->mr->approvalResultList = array(); +$lang->mr->approvalResult = '評審意見'; +$lang->mr->approvalResultList = array(); $lang->mr->approvalResultList['approve'] = '通過'; $lang->mr->approvalResultList['reject'] = '拒絕'; $lang->mr->needApproved = '需要通過評審才能合併'; -$lang->mr->needPassCI = '需要通過構建才能合併'; +$lang->mr->needCI = '需要通過構建才能合併'; $lang->mr->repeatedOperation = '請勿重複操作'; diff --git a/module/mr/model.php b/module/mr/model.php index 911d4e52a9..8b4d797b35 100644 --- a/module/mr/model.php +++ b/module/mr/model.php @@ -38,22 +38,21 @@ class mrModel extends model /** * Get MR list of gitlab project. * - * @param string $browseType - * @param string $assignee - * @param string $creator + * @param string $mode + * @param string $param * @param string $orderBy * @param object $pager * @access public * @return array */ - public function getList($browseType = 'all', $assignee = 'all', $creator = 'all', $orderBy = 'id_desc', $pager) + public function getList($mode = 'all', $param = 'all', $orderBy = 'id_desc', $pager) { $MRList = $this->dao->select('*') ->from(TABLE_MR) ->where('deleted')->eq('0') - ->beginIF($browseType != 'all')->andWhere('status')->eq($browseType)->fi() - ->beginIF($assignee != 'all')->andWhere('assignee')->eq($assignee)->fi() - ->beginIF($creator != 'all')->andWhere('createdBy')->eq($creator)->fi() + ->beginIF($mode == 'status' and $param != 'all')->andWhere('status')->eq($param)->fi() + ->beginIF($mode == 'assignee' and $param != 'all')->andWhere('assignee')->eq($param)->fi() + ->beginIF($mode == 'creator' and $param != 'all')->andWhere('createdBy')->eq($param)->fi() ->orderBy($orderBy) ->page($pager) ->fetchAll('id'); @@ -317,7 +316,7 @@ class mrModel extends model if(empty($condition)) continue; /* Update compile status of current MR object */ - if(isset($MR->needPassCI) and $MR->needPassCI == '1') + if(isset($MR->needCI) and $MR->needCI == '1') { $newMR->compileStatus = empty($MR->compileID) ? 'fail' : $this->loadModel('compile')->getByID($MR->compileID)->status; } @@ -564,8 +563,8 @@ class mrModel extends model $repo->account = ''; $repo->encoding = $encoding; - $lines = array(); - $commitsAdded = array(); + $lines = array(); + $commitList = array(); foreach ($diffVersions as $diffVersion) { $singleDiff = $this->apiGetSingleDiffVersion($MR->gitlabID, $MR->targetProject, $MR->mriid, $diffVersion->id); @@ -576,8 +575,8 @@ class mrModel extends model { /* Make sure every file with same commitID is unique in $lines. */ $shortID = $commits[$index]->short_id; - if(in_array($shortID, $commitsAdded)) continue; - $commitsAdded[] = $shortID; + if(in_array($shortID, $commitList)) continue; + $commitList[] = $shortID; $lines[] = sprintf("diff --git a/%s b/%s", $diff->old_path, $diff->new_path); $lines[] = sprintf("index %s ... %s %s ", $singleDiff->head_commit_sha, $singleDiff->base_commit_sha, $diff->b_mode); @@ -631,7 +630,7 @@ class mrModel extends model if(!empty($bindedUsers[$rawProjectUser->username])) $users[$rawProjectUser->username] = $bindedUsers[$rawProjectUser->username]; } if(!empty($users[$zentaoUser])) return $users[$zentaoUser]; - return ""; + return ''; } /** @@ -692,15 +691,16 @@ class mrModel extends model { $this->loadModel('action'); $actionID = $this->action->create('mrapproval', $MR->id, $action); + $oldMR = $MR; - if(isset($MR->status) and $MR->status == 'opened') + if(isset($MR->status) and $MR->status == 'opened') { $rawApprovalStatus = ''; if(isset($MR->approvalStatus)) $rawApprovalStatus = $MR->approvalStatus; $MR->approver = $this->app->user->account; if ($action == 'reject' and $rawApprovalStatus != 'rejected') $MR->approvalStatus = 'rejected'; if ($action == 'approve' and $rawApprovalStatus != 'approved') $MR->approvalStatus = 'approved'; - if (isset($MR->approvalStatus) and $rawApprovalStatus != $MR->approvalStatus) + if (isset($MR->approvalStatus) and $rawApprovalStatus != $MR->approvalStatus) { $changes = common::createChanges($oldMR, $MR); $this->action->logHistory($actionID, $changes); diff --git a/module/mr/view/browse.html.php b/module/mr/view/browse.html.php index f5a1286826..78dee0e53c 100644 --- a/module/mr/view/browse.html.php +++ b/module/mr/view/browse.html.php @@ -19,13 +19,13 @@
mr->statusList as $key => $label):?> - + $label";?> - {$pager->recTotal}";?> - + {$pager->recTotal}";?> + - app->user->account}&creator=all"), $lang->mr->assignedToMe, '', "class='btn btn-link $active'");?> - app->user->account}"), $lang->mr->createdByMe, '', "class='btn btn-link $active'");?> + app->user->account}"), $lang->mr->assignedToMe, '', "class='btn btn-link $active'");?> + app->user->account}"), $lang->mr->createdByMe, '', "class='btn btn-link $active'");?>
" . $lang->mr->create, '', "class='btn btn-primary'");?> @@ -46,7 +46,7 @@ - recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"; ?> + recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"; ?> diff --git a/module/mr/view/create.html.php b/module/mr/view/create.html.php index f5b656483f..978a7813a5 100644 --- a/module/mr/view/create.html.php +++ b/module/mr/view/create.html.php @@ -52,11 +52,11 @@ - + diff --git a/module/mr/view/diff.html.php b/module/mr/view/diff.html.php index d7d91ab097..cbc3adf06f 100644 --- a/module/mr/view/diff.html.php +++ b/module/mr/view/diff.html.php @@ -137,7 +137,7 @@ -mr->noChanges; endif;?> +mr->noChanges;?> diff --git a/module/mr/view/edit.html.php b/module/mr/view/edit.html.php index 493438235e..ff05957e2c 100644 --- a/module/mr/view/edit.html.php +++ b/module/mr/view/edit.html.php @@ -66,12 +66,12 @@ - +
mr->id); ?> mr->title); ?> mr->sourceProject); ?>
mr->needPassCI; ?>mr->needCI; ?>
- - + +
description, "rows='3' class='form-control'"); ?>
mr->needPassCI; ?>mr->needCI; ?>
- needPassCI == '1' ? 'checked' : '' ?> - name="needPassCI" value="1" id="needPassCI"> - + needCI == '1' ? 'checked' : '' ?> + name="needCI" value="1" id="needCI"> +