+
+ gogs->url;?>
+ url, $gogs->url, '_target');?>
+
+
+
++ + " . zget($lang->bug->osList, $os) . "";?> + +
+ ++ + " . zget($lang->bug->browserList, $browser) . "";?> + +
+ +", $build->logs); + if(empty($build->logs) and !in_array($build->status, array('created', 'pending'))) $build->logs = $this->compile->getLogs($job, $build); + $logs = str_replace("\r\n", "
", $build->logs); + $logs = str_replace("\n", "
", $logs); + + $this->view->logs = $logs; $this->view->build = $build; $this->view->job = $job; @@ -87,5 +93,23 @@ class compile extends control $this->view->position[] = $this->lang->compile->logs; $this->display(); } + + /** + * Sync compiles. + * + * @access public + * @return bool + */ + public function syncCompile() + { + $this->compile->syncCompile(); + + if(dao::isError()) + { + echo json_encode(dao::getError()); + return true; + } + echo 'success'; + } } diff --git a/module/compile/lang/de.php b/module/compile/lang/de.php index dfd19b4832..6ca3125a19 100644 --- a/module/compile/lang/de.php +++ b/module/compile/lang/de.php @@ -1,7 +1,8 @@ compile->common = 'Compile'; -$lang->compile->browse = 'History'; -$lang->compile->logs = 'Logs'; +$lang->compile->common = 'Compile'; +$lang->compile->browse = 'History'; +$lang->compile->logs = 'Logs'; +$lang->compile->syncCompile = 'Interface: Sync Compiles.'; $lang->compile->id = 'ID'; $lang->compile->name = 'Name'; diff --git a/module/compile/lang/en.php b/module/compile/lang/en.php index 68e5655bbb..cb397946ca 100644 --- a/module/compile/lang/en.php +++ b/module/compile/lang/en.php @@ -1,7 +1,8 @@ compile->common = 'Compile'; -$lang->compile->browse = 'History'; -$lang->compile->logs = 'Log'; +$lang->compile->common = 'Compile'; +$lang->compile->browse = 'History'; +$lang->compile->logs = 'Log'; +$lang->compile->syncCompile = 'Interface: Sync Compiles.'; $lang->compile->id = 'ID'; $lang->compile->name = 'Name'; diff --git a/module/compile/lang/fr.php b/module/compile/lang/fr.php index b53d0e038c..6d8eccec72 100644 --- a/module/compile/lang/fr.php +++ b/module/compile/lang/fr.php @@ -1,7 +1,8 @@ compile->common = 'Build'; -$lang->compile->browse = 'Historique Builds'; -$lang->compile->logs = 'Logs des Builds'; +$lang->compile->common = 'Build'; +$lang->compile->browse = 'Historique Builds'; +$lang->compile->logs = 'Logs des Builds'; +$lang->compile->syncCompile = 'Interface: Sync Compiles.'; $lang->compile->id = 'ID'; $lang->compile->name = 'Nom'; diff --git a/module/compile/lang/vi.php b/module/compile/lang/vi.php index b5f3389644..05d762a745 100644 --- a/module/compile/lang/vi.php +++ b/module/compile/lang/vi.php @@ -1,7 +1,8 @@ compile->common = 'Compile'; -$lang->compile->browse = 'Lịch sử'; -$lang->compile->logs = 'Nhật ký'; +$lang->compile->common = 'Compile'; +$lang->compile->browse = 'Lịch sử'; +$lang->compile->logs = 'Nhật ký'; +$lang->compile->syncCompile = 'Interface: Sync Compiles.'; $lang->compile->id = 'ID'; $lang->compile->name = 'Tên'; diff --git a/module/compile/lang/zh-cn.php b/module/compile/lang/zh-cn.php index e4e328cf01..395474b4d6 100644 --- a/module/compile/lang/zh-cn.php +++ b/module/compile/lang/zh-cn.php @@ -1,7 +1,8 @@ compile->common = '构建'; -$lang->compile->browse = '构建历史'; -$lang->compile->logs = '构建日志'; +$lang->compile->common = '构建'; +$lang->compile->browse = '构建历史'; +$lang->compile->logs = '构建日志'; +$lang->compile->syncCompile = '接口：同步构建记录'; $lang->compile->id = 'ID'; $lang->compile->name = '构建名称'; diff --git a/module/compile/model.php b/module/compile/model.php index 44a1e37ee5..c46cb33c72 100644 --- a/module/compile/model.php +++ b/module/compile/model.php @@ -134,6 +134,59 @@ class compileModel extends model return $url; } + /** + * Get compile logs. + * + * @param object $job + * @param object $compile + * @access public + * @return string + */ + public function getLogs($job, $compile) + { + $logs = ''; + + if($job->engine == 'jenkins') + { + $jenkins = $this->loadModel('jenkins')->getByID($job->server); + $jenkinsUser = $jenkins->account; + $jenkinsPassword = $jenkins->token ? $jenkins->token : base64_decode($jenkins->password); + $userPWD = "$jenkinsUser:$jenkinsPassword"; + + $infoUrl = sprintf('%s/job/%s/api/xml?tree=builds[id,number,queueId]&xpath=//build[queueId=%s]', $jenkins->url, $job->pipeline, $compile->queue); + $response = common::http($infoUrl, '', array(CURLOPT_USERPWD => $userPWD)); + if($response) + { + $buildInfo = simplexml_load_string($response); + $buildNumber = $buildInfo->number; + if(empty($buildNumber)) return ''; + + $logUrl = sprintf('%s/job/%s/%s/consoleText', $jenkins->url, $job->pipeline, $buildNumber); + $logs = common::http($logUrl, '', array(CURLOPT_USERPWD => $userPWD)); + $this->dao->update(TABLE_COMPILE)->set('logs')->eq($logs)->where('id')->eq($compile->id)->exec(); + } + } + else + { + /* Get jobs by pipeline. */ + $pipeline = json_decode($job->pipeline); + $projectID = isset($pipeline->project) ? $pipeline->project : ''; + $jobs = $this->loadModel('gitlab')->apiGetJobs($job->server, $projectID, $compile->queue); + + $this->loadModel('ci'); + foreach($jobs as $gitlabJob) + { + if(empty($gitlabJob->duration) or $gitlabJob->duration == '') $gitlabJob->duration = '-'; + $logs .= ">>> Job: $gitlabJob->name, Stage: $gitlabJob->stage, Status: $gitlabJob->status, Duration: $gitlabJob->duration Sec\r\n "; + $logs .= "Job URL: web_url\" target='_blank'>$gitlabJob->web_url \r\n"; + $logs .= $this->ci->transformAnsiToHtml($this->gitlab->apiGetJobLog($job->server, $projectID, $gitlabJob->id)); + } + } + + if(!empty($logs)) $this->dao->update(TABLE_COMPILE)->set('logs')->eq($logs)->where('id')->eq($compile->id)->exec(); + return $logs; + } + /** * Save build by job * @@ -157,6 +210,137 @@ class compileModel extends model $this->dao->insert(TABLE_COMPILE)->data($build)->exec(); } + /** + * Sync compiles. + * + * @param int $repoID + * @param int $repoID + * @access public + * @return void + */ + public function syncCompile($repoID = 0, $jobID = 0) + { + if($jobID) + { + $jobList[$jobID] = $this->loadModel('job')->getByID($jobID); + } + else + { + $jobList = $this->loadModel('job')->getList($repoID); + } + + $jenkinsPairs = $this->loadModel('pipeline')->getList('jenkins'); + $gitlabPairs = $this->loadModel('pipeline')->getList('gitlab'); + + foreach($jobList as $job) + { + if($job->engine == 'jenkins') + { + $server = zget($jenkinsPairs, $job->server); + $this->syncJenkinsBuildList($server, $job); + } + else + { + $server = zget($gitlabPairs, $job->server); + $this->syncGitLabBuildList($server, $job); + } + } + } + + /** + * Sync jenkins build list. + * + * @param object $jenkins + * @param object $job + * @access public + * @return void + */ + public function syncJenkinsBuildList($jenkins, $job) + { + $jenkinsUser = $jenkins->account; + $jenkinsPassword = $jenkins->token ? $jenkins->token : base64_decode($jenkins->password); + + /* Get build list by API. */ + $url = sprintf('%s/job/%s/api/json?tree=builds[id,number,result,queueId,timestamp]', $jenkins->url, $job->pipeline); + $response = common::http($url, '', array(CURLOPT_USERPWD => "$jenkinsUser:$jenkinsPassword")); + if(!$response) return false; + + $compilePairs = $this->dao->select('queue,job')->from(TABLE_COMPILE)->where('job')->eq($job->id)->andWhere('queue')->gt(0)->fetchPairs(); + $jobInfo = json_decode($response); + foreach($jobInfo->builds as $build) + { + $lastSyncTime = strtotime($job->lastSyncDate); + if($build->timestamp < $lastSyncTime * 1000) break; + if(isset($compilePairs[$build->queueId])) continue; + + $data = new stdclass(); + $data->name = $job->name; + $data->job = $job->id; + $data->queue = $build->queueId; + $data->status = $build->result == 'SUCCESS' ? 'success' : 'failure'; + $data->createdBy = 'guest'; + $data->createdDate = date('Y-m-d H:i:s', $build->timestamp / 1000); + $data->updateDate = $data->createdDate; + + $this->dao->insert(TABLE_COMPILE)->data($data)->exec(); + } + + $now = helper::now(); + $this->dao->update(TABLE_JOB)->set('lastSyncDate')->eq($now)->where('id')->eq($job->id)->exec(); + } + + /** + * Sync gitlab build list. + * + * @param object $gitlab + * @param object $job + * @access public + * @return void + */ + public function syncGitlabBuildList($gitlab, $job) + { + $pipeline = json_decode($job->pipeline); + $projectID = isset($pipeline->project) ? $pipeline->project : ''; + $ref = isset($pipeline->reference) ? $pipeline->reference : ''; + $url = sprintf($this->loadModel('gitlab')->getApiRoot($gitlab->id, false), "/projects/{$projectID}/pipelines"); + + /* Get build list by API. */ + for($page = 1; true; $page++) + { + $param = $job->lastSyncDate ? '&updated_after=' . date('YYYY-MM-DDThh:mm:ssZ', strtotime($job->lastSyncDate)) : ''; + $builds = json_decode(commonModel::http($url . "&ref={$ref}&order_by=id&sort=asc&page={$page}&per_page=100" . $param)); + if(!is_array($builds)) break; + + if(!empty($builds)) + { + $queueIDList = array(); + foreach($builds as $build) $queueIDList[] = $build->id; + $compilePairs = $this->dao->select('queue,job')->from(TABLE_COMPILE)->where('job')->eq($job->id)->andWhere('queue')->in($queueIDList)->fetchPairs(); + + foreach($builds as $build) + { + if(isset($compilePairs[$build->id])) continue; + + $data = new stdclass(); + $data->name = $job->name; + $data->job = $job->id; + $data->queue = $build->id; + $data->status = $build->status; + $data->createdBy = 'guest'; + $data->createdDate = date('Y-m-d H:i:s', strtotime($build->created_at)); + $data->updateDate = date('Y-m-d H:i:s', strtotime($build->updated_at)); + + $this->dao->insert(TABLE_COMPILE)->data($data)->exec(); + } + } + + if(count($builds) < 100) break; + } + + $now = helper::now(); + $this->dao->update(TABLE_JOB)->set('lastSyncDate')->eq($now)->where('id')->eq($job->id)->exec(); + } + /** * Execute compile * diff --git a/module/design/model.php b/module/design/model.php index 05ecc5863f..7fa9c33108 100644 --- a/module/design/model.php +++ b/module/design/model.php @@ -403,7 +403,16 @@ class designModel extends model */ public function setMenu($projectID, $products, $productID = 0) { - if($this->app->rawMethod != 'browse') unset($this->lang->waterfall->menu->design['subMenu']->bysearch); + /* Show custom design types. */ + $this->lang->waterfall->menu->design['subMenu'] = new stdclass(); + $this->lang->waterfall->menu->design['subMenu']->all = array('link' => "{$this->lang->all}|design|browse|projectID=%s&productID=0&browseType=all"); + foreach(array_filter($this->lang->design->typeList) as $key => $value) + { + $this->lang->waterfall->menu->design['subMenu']->$key = array('link' => "{$value}|design|browse|projectID=%s&productID=0&browseType={$key}"); + } + + if($this->app->rawMethod == 'browse') $this->lang->waterfall->menu->design['subMenu']->bysearch = array('link' => ' ' . $this->lang->searchAB . ''); + if(empty($products) || !$productID) return ''; $currentProduct = $this->loadModel('product')->getById($productID); setCookie("lastProduct", $productID, $this->config->cookieLife, $this->config->webRoot, '', false, true); diff --git a/module/doc/control.php b/module/doc/control.php index 4444f8b7cf..3335e01e46 100755 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -1126,7 +1126,7 @@ class doc extends control foreach(explode(',', $this->config->doc->customObjectLibs) as $libType) $customObjectLibs[$libType] = $this->lang->doc->customObjectLibs[$libType]; $actionURL = $this->createLink('doc', 'browse', "lib=0&browseType=bySearch&queryID=myQueryID"); - $this->doc->buildSearchForm(0, array(), 0, $actionURL, 'objectLibs'); + $this->doc->buildSearchForm(0, array(), 0, $actionURL, $type); $moduleTree = $type == 'book' ? $this->doc->getBookStructure($libID) : $this->doc->getTreeMenu($type, $objectID, $libID, 0, $docID); diff --git a/module/execution/control.php b/module/execution/control.php index db4c761453..c8b7475689 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -469,10 +469,13 @@ class execution extends control * * @param int $executionID * @param int $fromExecution + * @param int $recTotal + * @param int $recPerPage + * @param int $pageID * @access public * @return void */ - public function importTask($toExecution, $fromExecution = 0) + public function importTask($toExecution, $fromExecution = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1) { if(!empty($_POST)) { @@ -509,13 +512,20 @@ class execution extends control $tasks2Imported = zget($tasks, $fromExecution, array()); } + /* Pager. */ + $this->app->loadClass('pager', $static = true); + $recTotal = count($tasks2Imported); + $pager = new pager($recTotal, $recPerPage, $pageID); + $tasks2ImportedList = array_chunk($tasks2Imported, $pager->recPerPage, true); + /* Save session. */ $this->app->session->set('taskList', $this->app->getURI(true), 'execution'); $this->view->title = $execution->name . $this->lang->colon . $this->lang->execution->importTask; + $this->view->pager = $pager; $this->view->position[] = html::a(inlink('browse', "executionID=$toExecution"), $execution->name); $this->view->position[] = $this->lang->execution->importTask; - $this->view->tasks2Imported = $tasks2Imported; + $this->view->tasks2Imported = empty($tasks2ImportedList) ? $tasks2ImportedList : $tasks2ImportedList[$pageID - 1]; $this->view->executions = $executions; $this->view->executionID = $execution->id; $this->view->fromExecution = $fromExecution; @@ -632,7 +642,7 @@ class execution extends control $this->config->bug->search['params']['product']['values'] = array(''=>''); } $this->config->bug->search['params']['execution']['values'] = array(''=>'') + $executions + array('all'=>$this->lang->execution->aboveAllExecution); - $this->config->bug->search['params']['plan']['values'] = $this->loadModel('productplan')->getPairs(array_keys($products)); + $this->config->bug->search['params']['plan']['values'] = $this->loadModel('productplan')->getPairs(array_keys($products)); $this->config->bug->search['module'] = 'importBug'; $this->config->bug->search['params']['confirmed']['values'] = array('' => '') + $this->lang->bug->confirmedList; @@ -2179,15 +2189,9 @@ class execution extends control if(!empty($_POST)) { - $this->loadModel('action'); - $changes = $this->execution->activate($executionID); + $this->execution->activate($executionID); if(dao::isError()) return print(js::error(dao::getError())); - if($this->post->comment != '' or !empty($changes)) - { - $actionID = $this->action->create($this->objectType, $executionID, 'Activated', $this->post->comment); - $this->action->logHistory($actionID, $changes); - } $this->executeHooks($executionID); if(isonlybody() and $from == 'kanban') { @@ -2230,16 +2234,10 @@ class execution extends control if(!empty($_POST)) { - $this->loadModel('action'); $this->execution->computeBurn($executionID); - $changes = $this->execution->close($executionID); + $this->execution->close($executionID); if(dao::isError()) return print(js::error(dao::getError())); - if($this->post->comment != '' or !empty($changes)) - { - $actionID = $this->action->create($this->objectType, $executionID, 'Closed', $this->post->comment); - $this->action->logHistory($actionID, $changes); - } $this->executeHooks($executionID); if(isonlybody() and $from == 'kanban') { @@ -2890,6 +2888,7 @@ class execution extends control $this->dao->update(TABLE_EXECUTION)->set('deleted')->eq(1)->where('id')->eq($executionID)->exec(); $this->loadModel('action')->create('execution', $executionID, 'deleted', '', ACTIONMODEL::CAN_UNDELETED); $this->execution->updateUserView($executionID); + $this->loadModel('common')->syncPPEStatus($executionID); $this->session->set('execution', ''); $message = $this->executeHooks($executionID); diff --git a/module/execution/js/bug.js b/module/execution/js/bug.js index ce07804c40..7a73ac2808 100644 --- a/module/execution/js/bug.js +++ b/module/execution/js/bug.js @@ -2,4 +2,27 @@ $(function() { if(browseType != 'bysearch') $('#module' + param).closest('li').addClass('active'); if($('#bugList thead th.c-title').width() < 150) $('#bugList thead th.c-title').width(150); + + $('#bugList').on('change', "[name='bugIDList[]']", checkClosed); }); + +/** + * Closed bugs are not assignable. + * + * @access public + * @return void + */ +function checkClosed() +{ + var disabledAssigned = $('#bugList tr.checked .c-assignedTo a').length > 0 ? true : false; + $('#bugList tr.checked .c-assignedTo a').each(function() + { + if(!$(this).hasClass('disabled')) + { + disabledAssigned = false; + return false; + } + }); + + $('#mulAssigned').prop('disabled', disabledAssigned); +} diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php index 7ab7927d18..1cc9cb51bd 100644 --- a/module/execution/lang/de.php +++ b/module/execution/lang/de.php @@ -536,10 +536,19 @@ $lang->execution->treeLevel['task'] = 'Aufgabe anzeigen'; $lang->execution->treeLevel['story'] = 'Story anzeigen'; $lang->execution->action = new stdclass(); -$lang->execution->action->opened = '$date, created by $actor. $extra' . "\n"; -$lang->execution->action->managed = '$date, managed by $actor. $extra' . "\n"; -$lang->execution->action->edited = '$date, edited by $actor. $extra' . "\n"; -$lang->execution->action->extra = 'Linked products is %s.'; +$lang->execution->action->opened = '$date, created by $actor. $extra' . "\n"; +$lang->execution->action->managed = '$date, managed by $actor. $extra' . "\n"; +$lang->execution->action->edited = '$date, edited by $actor. $extra' . "\n"; +$lang->execution->action->extra = 'Linked products is %s.'; +$lang->execution->action->startbychildactivate = '$date, activating the sub stage sets the execution status as Ongoing.' . "\n"; +$lang->execution->action->waitbychilddelete = '$date, deleting the sub stage sets the execution status as waitting.' . "\n"; +$lang->execution->action->closebychilddelete = '$date, deleting the sub stage sets the execution status as closing.' . "\n"; +$lang->execution->action->closebychildclose = '$date, closing the sub stage sets the execution status as closing.' . "\n"; + +$lang->execution->startbychildactivate = 'activated'; +$lang->execution->waitbychilddelete = 'stop'; +$lang->execution->closebychilddelete = 'closed'; +$lang->execution->closebychildclose = 'closed'; $lang->execution->statusColorList = array(); $lang->execution->statusColorList['wait'] = '#0991FF'; diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php index cf11af6af7..4c34595681 100644 --- a/module/execution/lang/en.php +++ b/module/execution/lang/en.php @@ -536,10 +536,19 @@ $lang->execution->treeLevel['task'] = 'Stories&Tasks'; $lang->execution->treeLevel['story'] = 'Only Stories'; $lang->execution->action = new stdclass(); -$lang->execution->action->opened = '$date, created by $actor. $extra' . "\n"; -$lang->execution->action->managed = '$date, managed by $actor. $extra' . "\n"; -$lang->execution->action->edited = '$date, edited by $actor. $extra' . "\n"; -$lang->execution->action->extra = 'Linked products is %s.'; +$lang->execution->action->opened = '$date, created by $actor. $extra' . "\n"; +$lang->execution->action->managed = '$date, managed by $actor. $extra' . "\n"; +$lang->execution->action->edited = '$date, edited by $actor. $extra' . "\n"; +$lang->execution->action->extra = 'Linked products is %s.'; +$lang->execution->action->startbychildactivate = '$date, activating the sub stage sets the execution status as Ongoing.' . "\n"; +$lang->execution->action->waitbychilddelete = '$date, deleting the sub stage sets the execution status as waitting.' . "\n"; +$lang->execution->action->closebychilddelete = '$date, deleting the sub stage sets the execution status as closing.' . "\n"; +$lang->execution->action->closebychildclose = '$date, closing the sub stage sets the execution status as closing.' . "\n"; + +$lang->execution->startbychildactivate = 'activated'; +$lang->execution->waitbychilddelete = 'stop'; +$lang->execution->closebychilddelete = 'closed'; +$lang->execution->closebychildclose = 'closed'; $lang->execution->statusColorList = array(); $lang->execution->statusColorList['wait'] = '#0991FF'; diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php index 6dea9a32aa..3e71a37d6b 100644 --- a/module/execution/lang/fr.php +++ b/module/execution/lang/fr.php @@ -536,10 +536,19 @@ $lang->execution->treeLevel['task'] = 'Stories&Tâches'; $lang->execution->treeLevel['story'] = 'Seulement Stories'; $lang->execution->action = new stdclass(); -$lang->execution->action->opened = '$date, created by $actor. $extra' . "\n"; -$lang->execution->action->managed = '$date, managed by $actor. $extra' . "\n"; -$lang->execution->action->edited = '$date, edited by $actor. $extra' . "\n"; -$lang->execution->action->extra = 'Linked products is %s.'; +$lang->execution->action->opened = '$date, created by $actor. $extra' . "\n"; +$lang->execution->action->managed = '$date, managed by $actor. $extra' . "\n"; +$lang->execution->action->edited = '$date, edited by $actor. $extra' . "\n"; +$lang->execution->action->extra = 'Linked products is %s.'; +$lang->execution->action->startbychildactivate = '$date, activating the sub stage sets the execution status as Ongoing.' . "\n"; +$lang->execution->action->waitbychilddelete = '$date, deleting the sub stage sets the execution status as waitting.' . "\n"; +$lang->execution->action->closebychilddelete = '$date, deleting the sub stage sets the execution status as closing.' . "\n"; +$lang->execution->action->closebychildclose = '$date, closing the sub stage sets the execution status as closing.' . "\n"; + +$lang->execution->startbychildactivate = 'activated'; +$lang->execution->waitbychilddelete = 'stop'; +$lang->execution->closebychilddelete = 'closed'; +$lang->execution->closebychildclose = 'closed'; $lang->execution->statusColorList = array(); $lang->execution->statusColorList['wait'] = '#0991FF'; diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php index a064ccd15c..046e868a9d 100644 --- a/module/execution/lang/zh-cn.php +++ b/module/execution/lang/zh-cn.php @@ -536,10 +536,19 @@ $lang->execution->treeLevel['task'] = '全部显示'; $lang->execution->treeLevel['story'] = "只看{$lang->SRCommon}"; $lang->execution->action = new stdclass(); -$lang->execution->action->opened = '$date, 由 $actor 创建。$extra' . "\n"; -$lang->execution->action->managed = '$date, 由 $actor 维护。$extra' . "\n"; -$lang->execution->action->edited = '$date, 由 $actor 编辑。$extra' . "\n"; -$lang->execution->action->extra = '相关产品为 %s。'; +$lang->execution->action->opened = '$date, 由 $actor 创建。$extra' . "\n"; +$lang->execution->action->managed = '$date, 由 $actor 维护。$extra' . "\n"; +$lang->execution->action->edited = '$date, 由 $actor 编辑。$extra' . "\n"; +$lang->execution->action->extra = '相关产品为 %s。'; +$lang->execution->action->startbychildactivate = '$date, 系统判断由于子阶段激活，将' . $lang->executionCommon . '状态置为进行中。' . "\n"; +$lang->execution->action->waitbychilddelete = '$date, 系统判断由于子阶段删除，将' . $lang->executionCommon . '状态置为未开始。' . "\n"; +$lang->execution->action->closebychilddelete = '$date, 系统判断由于子阶段删除，将' . $lang->executionCommon . '状态置为已关闭。' . "\n"; +$lang->execution->action->closebychildclose = '$date, 系统判断由于子阶段关闭，将' . $lang->executionCommon . '状态置为已关闭。' . "\n"; + +$lang->execution->startbychildactivate = '激活了'; +$lang->execution->waitbychilddelete = '停止了'; +$lang->execution->closebychilddelete = '关闭了'; +$lang->execution->closebychildclose = '关闭了'; $lang->execution->statusColorList = array(); $lang->execution->statusColorList['wait'] = '#0991FF'; diff --git a/module/execution/model.php b/module/execution/model.php index 98153d49c7..39756b26b9 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -1005,17 +1005,24 @@ class executionModel extends model } } + $changes = common::createChanges($oldExecution, $execution); + if($this->post->comment != '' or !empty($changes)) + { + $this->loadModel('action'); + $actionID = $this->action->create('execution', $executionID, 'Activated', $this->post->comment); + $this->action->logHistory($actionID, $changes); + } + /* Update the status of the parent stage. */ if($oldExecution->type == 'stage') { $parent = $this->getByID($oldExecution->parent); - if($parent->type == 'stage' and $parent->status == 'closed') + if($parent->type == 'stage' and in_array($parent->status, array('closed', 'wait'))) { $this->dao->update(TABLE_EXECUTION)->set('status')->eq('doing')->where('id')->eq($parent->id)->exec(); + $this->loadModel('action')->create('execution', $parent->id, 'startbychildactivate'); } } - - if(!dao::isError()) return common::createChanges($oldExecution, $execution); } /** @@ -1058,6 +1065,15 @@ class executionModel extends model if(!dao::isError()) { + + $changes = common::createChanges($oldExecution, $execution); + if($this->post->comment != '' or !empty($changes)) + { + $this->loadModel('action'); + $actionID = $this->action->create('execution', $executionID, 'Closed', $this->post->comment); + $this->action->logHistory($actionID, $changes); + } + /* Update the status of the parent stage. */ if($oldExecution->type == 'stage') { @@ -1071,12 +1087,15 @@ class executionModel extends model if($childExecution->status != 'closed') $isClosed = false; } - if($isClosed) $this->dao->update(TABLE_EXECUTION)->set('status')->eq('closed')->where('id')->eq($parent->id)->exec(); + if($isClosed) + { + $this->dao->update(TABLE_EXECUTION)->set('status')->eq('closed')->where('id')->eq($parent->id)->exec(); + $this->loadModel('action')->create('execution', $parent->id, 'closebychildclose'); + } } } $this->loadModel('score')->create('execution', 'close', $oldExecution); - return common::createChanges($oldExecution, $execution); } } @@ -1411,7 +1430,7 @@ class executionModel extends model /** * Get execution stat data. - + * @param int $projectID * @param string $browseType all|undone|wait|doing|suspended|closed|involved|bySearch|review * @param int $productID @@ -2689,7 +2708,7 @@ class executionModel extends model $this->story->setStage($storyID); $this->linkCases($executionID, (int)$products[$storyID], $storyID); - $action = $executionID == $this->session->project ? 'linked2project' : 'linked2execution'; + $action = $execution->type == 'project' ? 'linked2project' : 'linked2execution'; if($action == 'linked2execution' and $execution->type == 'kanban') $action = 'linked2kanban'; $this->action->create('story', $storyID, $action, '', $executionID); } diff --git a/module/execution/view/bug.html.php b/module/execution/view/bug.html.php index 0dcf920a7a..606c7aee68 100644 --- a/module/execution/view/bug.html.php +++ b/module/execution/view/bug.html.php @@ -162,7 +162,7 @@ diff --git a/module/file/control.php b/module/file/control.php index 6ce27a6fc5..36e29ae62e 100755 --- a/module/file/control.php +++ b/module/file/control.php @@ -130,6 +130,7 @@ class file extends control if(!$this->file->checkPriv($file)) { echo(js::alert($this->lang->file->accessDenied)); + if(isonlybody()) return print(js::reload('parent.parent')); return print(js::locate(helper::createLink('my', 'index'))); } diff --git a/module/file/model.php b/module/file/model.php index b4d6fa25a6..aaf8813c45 100755 --- a/module/file/model.php +++ b/module/file/model.php @@ -565,7 +565,7 @@ class fileModel extends model } elseif($objectType == 'feedback') { - $productID = $this->dao->findById($objectID)->from(TABLE_FEEDBACK)->fetch(); + $productID = $this->dao->findById($objectID)->from(TABLE_FEEDBACK)->fetch('product'); $grantProducts = $this->loadModel('feedback')->getGrantProducts(); return in_array($productID, array_keys($grantProducts)); } diff --git a/module/git/control.php b/module/git/control.php index 3858b35fcb..102621c7b0 100644 --- a/module/git/control.php +++ b/module/git/control.php @@ -34,24 +34,30 @@ class git extends control { if(isset($_GET['repoUrl'])) $path = $this->get->repoUrl; - $path = helper::safe64Decode($path); - if(common::hasPriv('repo', 'diff')) + $path = helper::safe64Decode($path); + $repos = $this->loadModel('repo')->getListBySCM('Git,Gitlab,Gogs,Gitea', 'haspriv'); + $currentRepo = null; + foreach($repos as $repo) { - $repos = $this->loadModel('repo')->getListBySCM('Git,Gitlab', 'haspriv'); - foreach($repos as $repo) - { - if(strpos($path, $repo->path) === 0) - { - $entry = $this->repo->encodePath(str_replace($repo->path, '', $path)); - $oldRevision = "$revision^"; - $this->locate($this->repo->createLink('diff', "repoID=$repo->id&objectID=0&entry=$entry&oldRevision=$oldRevision&revision=$revision", 'html', 'true')); - } - } + if(!empty($repo->path) and strpos($path, $repo->path) === 0) $currentRepo = $repo; + } + + if($currentRepo and common::hasPriv('repo', 'diff')) + { + $entry = $this->repo->encodePath(str_replace($currentRepo->path, '', $path)); + $oldRevision = "$revision^"; + return $this->locate($this->repo->createLink('diff', "repoID=$currentRepo->id&objectID=0&entry=$entry&oldRevision=$oldRevision&revision=$revision", 'html', 'true')); + } + + if($currentRepo) + { + $scm = $this->app->loadClass('scm'); + $scm->setEngine($currentRepo); } $this->view->path = $path; $this->view->revision = $revision; - $this->view->diff = $this->git->diff($path, $revision); + $this->view->diff = $currentRepo ? $scm->diff($path, $revision) : ''; $this->display(); } @@ -68,23 +74,28 @@ class git extends control { if(isset($_GET['repoUrl'])) $path = $this->get->repoUrl; - $path = helper::safe64Decode($path); - if(common::hasPriv('repo', 'view')) + $path = helper::safe64Decode($path); + $repos = $this->loadModel('repo')->getListBySCM('Git,Gitlab,Gogs,Gitea', 'haspriv'); + $currentRepo = null; + foreach($repos as $repo) { - $repos = $this->loadModel('repo')->getListBySCM('Git,Gitlab', 'haspriv'); - foreach($repos as $repo) - { - if(strpos($path, $repo->path) === 0) - { - $entry = $this->repo->encodePath(str_replace($repo->path, '', $path)); - $this->locate($this->repo->createLink('view', "repoID=$repo->id&objectID=0&entry=$entry&revision=$revision", 'html', true)); - } - } + if(!empty($repo->path) and strpos($path, $repo->path) === 0) $currentRepo = $repo; } + if($currentRepo and common::hasPriv('repo', 'view')) + { + $entry = $this->repo->encodePath(str_replace($currentRepo->path, '', $path)); + return $this->locate($this->repo->createLink('view', "repoID=$currentRepo->id&objectID=0&entry=$entry&revision=$revision", 'html', true)); + } + + if($currentRepo) + { + $scm = $this->app->loadClass('scm'); + $scm->setEngine($currentRepo); + } $this->view->path = $path; $this->view->revision = $revision; - $this->view->code = $this->git->cat($path, $revision); + $this->view->code = $currentRepo ? $scm->cat($path, $revision) : ''; $this->display(); } diff --git a/module/git/model.php b/module/git/model.php index 231e79682f..28797cae14 100644 --- a/module/git/model.php +++ b/module/git/model.php @@ -128,18 +128,24 @@ class gitModel extends model $branches = $this->repo->getBranches($repo); $commits = $repo->commits; - $gitlabAccountPairs = array(); + $accountPairs = array(); if($repo->SCM == 'Gitlab') { - $gitlabUserList = $this->loadModel('gitlab')->apiGetUsers($repo->gitService); - $acountIDPairs = $this->gitlab->getUserIdAccountPairs($repo->gitService); - foreach($gitlabUserList as $gitlabUser) $gitlabAccountPairs[$gitlabUser->realname] = zget($acountIDPairs, $gitlabUser->id, ''); + $userList = $this->loadModel('gitlab')->apiGetUsers($repo->gitService); + $acountIDPairs = $this->gitlab->getUserIdAccountPairs($repo->gitService); + foreach($userList as $gitlabUser) $accountPairs[$gitlabUser->realname] = zget($acountIDPairs, $gitlabUser->id, ''); } elseif($repo->SCM == 'Gitea') { - $gitlabUserList = $this->loadModel('gitea')->apiGetUsers($repo->gitService); - $acountIDPairs = $this->gitea->getUserAccountIdPairs($repo->gitService, 'openID,account'); - foreach($gitlabUserList as $gitlabUser) $gitlabAccountPairs[$gitlabUser->realname] = zget($acountIDPairs, $gitlabUser->id, ''); + $userList = $this->loadModel('gitea')->apiGetUsers($repo->gitService); + $acountIDPairs = $this->gitea->getUserAccountIdPairs($repo->gitService, 'openID,account'); + foreach($userList as $gitlabUser) $accountPairs[$gitlabUser->realname] = zget($acountIDPairs, $gitlabUser->id, ''); + } + elseif($repo->SCM == 'Gogs') + { + $userList = $this->loadModel('gogs')->apiGetUsers($repo->gitService); + $acountIDPairs = $this->gogs->getUserAccountIdPairs($repo->gitService, 'openID,account'); + foreach($userList as $gitlabUser) $accountPairs[$gitlabUser->realname] = zget($acountIDPairs, $gitlabUser->id, ''); } /* Update code commit history. */ @@ -183,7 +189,7 @@ class gitModel extends model ' task:' . join(' ', $objects['tasks']) . ' bug:' . join(',', $objects['bugs'])); - if($lastVersion != $version) $this->repo->saveAction2PMS($objects, $log, $this->repoRoot, $repo->encoding, 'git', $gitlabAccountPairs); + if($lastVersion != $version) $this->repo->saveAction2PMS($objects, $log, $this->repoRoot, $repo->encoding, 'git', $accountPairs); } else { diff --git a/module/gitea/control.php b/module/gitea/control.php index cd18b89de5..7d7f851726 100644 --- a/module/gitea/control.php +++ b/module/gitea/control.php @@ -141,9 +141,9 @@ class gitea extends control { if($confirm != 'yes') return print(js::confirm($this->lang->gitea->confirmDelete, inlink('delete', "id=$giteaID&confirm=yes"))); - $oldGitea = $this->loadModel('pipeline')->getByID($giteaID); $actionID = $this->pipeline->delete($giteaID, 'gitea'); + if(!$actionID) return print(js::error($this->lang->pipeline->delError)); $gitea = $this->pipeline->getByID($giteaID); $changes = common::createChanges($oldGitea, $gitea); diff --git a/module/gitea/lang/de.php b/module/gitea/lang/de.php index 5eb0f97d89..6ed177b6f3 100644 --- a/module/gitea/lang/de.php +++ b/module/gitea/lang/de.php @@ -1,5 +1,4 @@ gitea = new stdclass; $lang->gitea->common = 'Gitea'; $lang->gitea->browse = 'Gitea Browse'; $lang->gitea->search = 'Search'; diff --git a/module/gitea/lang/en.php b/module/gitea/lang/en.php index 5eb0f97d89..6ed177b6f3 100644 --- a/module/gitea/lang/en.php +++ b/module/gitea/lang/en.php @@ -1,5 +1,4 @@ gitea = new stdclass; $lang->gitea->common = 'Gitea'; $lang->gitea->browse = 'Gitea Browse'; $lang->gitea->search = 'Search'; diff --git a/module/gitea/lang/fr.php b/module/gitea/lang/fr.php index 5eb0f97d89..6ed177b6f3 100644 --- a/module/gitea/lang/fr.php +++ b/module/gitea/lang/fr.php @@ -1,5 +1,4 @@ gitea = new stdclass; $lang->gitea->common = 'Gitea'; $lang->gitea->browse = 'Gitea Browse'; $lang->gitea->search = 'Search'; diff --git a/module/gitea/lang/vi.php b/module/gitea/lang/vi.php index ad89c301d3..599193344d 100644 --- a/module/gitea/lang/vi.php +++ b/module/gitea/lang/vi.php @@ -1,5 +1,4 @@ gitea = new stdclass; $lang->gitea->common = 'Gitea'; $lang->gitea->browse = 'Gitea Browse'; $lang->gitea->search = 'Search'; diff --git a/module/gitea/lang/zh-cn.php b/module/gitea/lang/zh-cn.php index 13e4c187a5..b51208fc93 100644 --- a/module/gitea/lang/zh-cn.php +++ b/module/gitea/lang/zh-cn.php @@ -1,5 +1,4 @@ gitea = new stdclass; $lang->gitea->common = 'Gitea'; $lang->gitea->browse = '浏览Gitea'; $lang->gitea->search = '搜索'; diff --git a/module/gitea/lang/zh-tw.php b/module/gitea/lang/zh-tw.php index 7e273df350..e6af6242d3 100644 --- a/module/gitea/lang/zh-tw.php +++ b/module/gitea/lang/zh-tw.php @@ -1,5 +1,4 @@ gitea = new stdclass; $lang->gitea->common = 'Gitea'; $lang->gitea->browse = '浏览Gitea'; $lang->gitea->search = '搜索'; diff --git a/module/gitlab/control.php b/module/gitlab/control.php index 6cd8195de4..279d7db0a6 100644 --- a/module/gitlab/control.php +++ b/module/gitlab/control.php @@ -228,11 +228,10 @@ class gitlab extends control { if($confirm != 'yes') return print(js::confirm($this->lang->gitlab->confirmDelete, inlink('delete', "id=$id&confirm=yes"))); - $oldGitLab = $this->gitlab->getByID($id); - $this->loadModel('action'); - $this->gitlab->delete(TABLE_PIPELINE, $id); + $oldGitLab = $this->loadModel('pipeline')->getByID($id); + $actionID = $this->pipeline->delete($id, 'gitlab'); + if(!$actionID) return print(js::error($this->lang->pipeline->delError)); - $actionID = $this->dao->lastInsertID(); $gitLab = $this->gitlab->getByID($id); $changes = common::createChanges($oldGitLab, $gitLab); $this->action->logHistory($actionID, $changes); @@ -722,7 +721,7 @@ class gitlab extends control $gitlab = $this->gitlab->getByID($gitlabID); $repos = $this->loadModel('repo')->getRepoListByClient($gitlabID); $repoPairs = array(); - foreach($repos as $repo) $repoPairs[$repo->path] = $repo->id; + foreach($repos as $repo) $repoPairs[$repo->serviceProject] = $repo->id; $this->view->gitlab = $gitlab; $this->view->keyword = urldecode(urldecode($keyword)); @@ -966,17 +965,13 @@ class gitlab extends control /** * Import gitlab issue to zentaopms. * - * @param int $repoID + * @param int $gitlabID + * @param int $projectID * @access public * @return void */ - public function importIssue($repoID) + public function importIssue($gitlabID, $projectID) { - $repo = $this->loadModel('repo')->getRepoByID($repoID); - $productIDList = explode(',', $repo->product); - $gitlabID = $repo->gitService; - $projectID = $repo->project; - $gitlab = $this->gitlab->getByID($gitlabID); if($gitlab) $user = $this->gitlab->apiGetCurrentUser($gitlab->url, $gitlab->token); if(empty($user->is_admin)) return print(js::alert($this->lang->gitlab->tokenLimit) . js::locate($this->createLink('gitlab', 'edit', array('gitlabID' => $gitlabID)))); @@ -1053,13 +1048,11 @@ class gitlab extends control } } - $products = array('' => ''); - $this->loadModel("product"); - foreach($productIDList as $productID) $products[$productID] = $this->product->getByID($productID)->name; + $products = $this->loadModel("product")->getPairs(); $this->view->title = $this->lang->gitlab->common . $this->lang->colon . $this->lang->gitlab->importIssue; $this->view->importable = empty($gitlabIssues) ? false : true; - $this->view->products = $products; + $this->view->products = array('' => '') + $products; $this->view->gitlabID = $gitlabID; $this->view->gitlabProjectID = $projectID; $this->view->objectTypes = $this->config->gitlab->objectTypes; diff --git a/module/gitlab/lang/de.php b/module/gitlab/lang/de.php index ef5d63cc87..f3b3b2d451 100644 --- a/module/gitlab/lang/de.php +++ b/module/gitlab/lang/de.php @@ -1,5 +1,4 @@ gitlab = new stdclass; $lang->gitlab->common = 'GitLab'; $lang->gitlab->browse = 'GitLab Browse'; $lang->gitlab->search = 'Search'; diff --git a/module/gitlab/lang/en.php b/module/gitlab/lang/en.php index ef5d63cc87..f3b3b2d451 100644 --- a/module/gitlab/lang/en.php +++ b/module/gitlab/lang/en.php @@ -1,5 +1,4 @@ gitlab = new stdclass; $lang->gitlab->common = 'GitLab'; $lang->gitlab->browse = 'GitLab Browse'; $lang->gitlab->search = 'Search'; diff --git a/module/gitlab/lang/fr.php b/module/gitlab/lang/fr.php index ef5d63cc87..f3b3b2d451 100644 --- a/module/gitlab/lang/fr.php +++ b/module/gitlab/lang/fr.php @@ -1,5 +1,4 @@ gitlab = new stdclass; $lang->gitlab->common = 'GitLab'; $lang->gitlab->browse = 'GitLab Browse'; $lang->gitlab->search = 'Search'; diff --git a/module/gitlab/lang/vi.php b/module/gitlab/lang/vi.php index ef5d63cc87..f3b3b2d451 100644 --- a/module/gitlab/lang/vi.php +++ b/module/gitlab/lang/vi.php @@ -1,5 +1,4 @@ gitlab = new stdclass; $lang->gitlab->common = 'GitLab'; $lang->gitlab->browse = 'GitLab Browse'; $lang->gitlab->search = 'Search'; diff --git a/module/gitlab/lang/zh-cn.php b/module/gitlab/lang/zh-cn.php index ef8637489c..402c550fbf 100644 --- a/module/gitlab/lang/zh-cn.php +++ b/module/gitlab/lang/zh-cn.php @@ -1,5 +1,4 @@ gitlab = new stdclass; $lang->gitlab->common = 'GitLab'; $lang->gitlab->browse = '浏览GitLab'; $lang->gitlab->search = '搜索'; diff --git a/module/gitlab/lang/zh-tw.php b/module/gitlab/lang/zh-tw.php index cb886aeab1..3ceb69d896 100644 --- a/module/gitlab/lang/zh-tw.php +++ b/module/gitlab/lang/zh-tw.php @@ -1,5 +1,4 @@ gitlab = new stdclass; $lang->gitlab->common = 'GitLab'; $lang->gitlab->browse = '瀏覽GitLab'; $lang->gitlab->search = '搜索'; diff --git a/module/gitlab/model.php b/module/gitlab/model.php index 00c4e51721..d5ab4d0eb6 100644 --- a/module/gitlab/model.php +++ b/module/gitlab/model.php @@ -986,7 +986,7 @@ class gitlabModel extends model */ public function apiGetSingleProject($gitlabID, $projectID) { - $url = sprintf($this->getApiRoot($gitlabID), "/projects/$projectID"); + $url = sprintf($this->getApiRoot($gitlabID, false), "/projects/$projectID"); return json_decode(commonModel::http($url)); } @@ -2879,4 +2879,20 @@ class gitlabModel extends model $html .= ''; return $html; } + + /** + * Get pipeline with api. + * + * @param int $gitlabID + * @param int $projectID + * @param string $branch + * @access public + * @return object|array + */ + public function apiGetPipeline($gitlabID, $projectID, $branch) + { + $apiRoot = $this->getApiRoot($gitlabID); + $url = sprintf($apiRoot, "/projects/$projectID/pipelines") . "&ref=$branch"; + return json_decode(commonModel::http($url)); + } } diff --git a/module/gitlab/view/binduser.html.php b/module/gitlab/view/binduser.html.php index 714b43a683..4f551b24d7 100644 --- a/module/gitlab/view/binduser.html.php +++ b/module/gitlab/view/binduser.html.php @@ -56,7 +56,7 @@
+
+
diff --git a/module/gogs/view/browse.html.php b/module/gogs/view/browse.html.php
new file mode 100644
index 0000000000..d925058381
--- /dev/null
+++ b/module/gogs/view/browse.html.php
@@ -0,0 +1,73 @@
+
+ * @package gogs
+ * @version $Id$
+ * @link http://www.zentao.net
+ */
+?>
+
+
+
+
+
+
+
+
+
++ noData;?> + + createLink('gogs', 'create'), " " . $lang->gogs->create, '', "class='btn btn-info'");?> + +
+
+
+
+
+
diff --git a/module/gogs/view/create.html.php b/module/gogs/view/create.html.php
new file mode 100644
index 0000000000..df7c376c66
--- /dev/null
+++ b/module/gogs/view/create.html.php
@@ -0,0 +1,45 @@
+
+ * @package gogs
+ * @version $Id$
+ * @link http://www.zentao.net
+ */
+?>
+
+
+
+
diff --git a/module/gogs/view/edit.html.php b/module/gogs/view/edit.html.php
new file mode 100644
index 0000000000..aafb2fe439
--- /dev/null
+++ b/module/gogs/view/edit.html.php
@@ -0,0 +1,45 @@
+
+ * @package gogs
+ * @version $Id$
+ * @link http://www.zentao.net
+ */
+?>
+
+
+
+
+
+
+
+
+ gogs->lblCreate;?>
+
+
+
diff --git a/module/gogs/view/view.html.php b/module/gogs/view/view.html.php
new file mode 100644
index 0000000000..66cb881716
--- /dev/null
+++ b/module/gogs/view/view.html.php
@@ -0,0 +1,37 @@
+
+ * @package GitLab
+ * @version $Id: view.html.php 4728 2013-05-03 06:14:34Z david18810279601@gmail.com $
+ * @link http://www.zentao.net
+ * */
+?>
+
+
+
+
+
+
+
+
+
+ gogs->edit;?>
+
+
+
+
+
+
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 6c313d612c..351d6ac032 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -70,7 +70,8 @@ $lang->moduleOrder[215] = 'message';
$lang->moduleOrder[220] = 'gitlab';
$lang->moduleOrder[225] = 'mr';
$lang->moduleOrder[230] = 'app';
-$lang->moduleOrder[235] = 'gitea';
+$lang->moduleOrder[235] = 'gogs';
+$lang->moduleOrder[240] = 'gitea';
$lang->resource = new stdclass();
@@ -1225,11 +1226,13 @@ $lang->ci->methodOrder[5] = 'commitResult';
$lang->ci->methodOrder[10] = 'checkCompileStatus';
$lang->resource->compile = new stdclass();
-$lang->resource->compile->browse = 'browse';
-$lang->resource->compile->logs = 'logs';
+$lang->resource->compile->browse = 'browse';
+$lang->resource->compile->logs = 'logs';
+$lang->resource->compile->syncCompile = 'syncCompile';
$lang->compile->methodOrder[5] = 'browse';
$lang->compile->methodOrder[10] = 'logs';
+$lang->compile->methodOrder[15] = 'syncCompile';
$lang->resource->jenkins = new stdclass();
$lang->resource->jenkins->browse = 'browseAction';
@@ -1436,6 +1439,22 @@ $lang->gitlab->methodOrder[145] = 'browseTag';
$lang->gitlab->methodOrder[150] = 'createTag';
$lang->gitlab->methodOrder[155] = 'deleteTag';
+/* Gogs. */
+$lang->resource->gogs = new stdclass();
+$lang->resource->gogs->browse = 'browse';
+$lang->resource->gogs->create = 'create';
+$lang->resource->gogs->edit = 'edit';
+$lang->resource->gogs->view = 'view';
+$lang->resource->gogs->delete = 'delete';
+$lang->resource->gogs->bindUser = 'bindUser';
+
+$lang->gogs->methodOrder[5] = 'browse';
+$lang->gogs->methodOrder[10] = 'create';
+$lang->gogs->methodOrder[15] = 'edit';
+$lang->gogs->methodOrder[20] = 'view';
+$lang->gogs->methodOrder[25] = 'delete';
+$lang->gogs->methodOrder[30] = 'bindUser';
+
/* Gitea. */
$lang->resource->gitea = new stdclass();
$lang->resource->gitea->browse = 'browse';
diff --git a/module/install/lang/de.php b/module/install/lang/de.php
index 5c7d739bf6..ac375fa988 100644
--- a/module/install/lang/de.php
+++ b/module/install/lang/de.php
@@ -162,7 +162,7 @@ $lang->install->account = 'Admin Konto';
$lang->install->password = 'Admin Passwort';
$lang->install->placeholder = new stdclass();
-$lang->install->placeholder->password = 'Combination of letters, numbers and special symbols, at least 6 characters';
+$lang->install->placeholder->password = 'The Password should be ≥ 6 characters, combination of uppercase, lowercase letters and numbers.';
$lang->install->errorEmpty['company'] = "{$lang->install->company} should not be blank.";
$lang->install->errorEmpty['account'] = "{$lang->install->account} should not be blank.";
diff --git a/module/install/lang/en.php b/module/install/lang/en.php
index cfba4afa3c..ae67f6612d 100644
--- a/module/install/lang/en.php
+++ b/module/install/lang/en.php
@@ -162,7 +162,7 @@ $lang->install->account = 'Admin Account';
$lang->install->password = 'Admin Password';
$lang->install->placeholder = new stdclass();
-$lang->install->placeholder->password = 'Combination of letters, numbers and special symbols, at least 6 characters';
+$lang->install->placeholder->password = 'The Password should be ≥ 6 characters, combination of uppercase, lowercase letters and numbers.';
$lang->install->errorEmpty['company'] = "{$lang->install->company} should not be blank.";
$lang->install->errorEmpty['account'] = "{$lang->install->account} should not be blank.";
diff --git a/module/install/lang/fr.php b/module/install/lang/fr.php
index c5d7bfad74..ffa59af709 100644
--- a/module/install/lang/fr.php
+++ b/module/install/lang/fr.php
@@ -162,7 +162,7 @@ $lang->install->account = 'Compte Admin';
$lang->install->password = 'Mot de Passe Admin';
$lang->install->placeholder = new stdclass();
-$lang->install->placeholder->password = 'Combination of letters, numbers and special symbols, at least 6 characters';
+$lang->install->placeholder->password = 'Le mot de passe doit ≥ 6 caractères, combinaison de lettres majuscules, minuscules et de chiffres.';
$lang->install->errorEmpty['company'] = "{$lang->install->company} should not be blank.";
$lang->install->errorEmpty['account'] = "{$lang->install->account} should not be blank.";
diff --git a/module/install/lang/zh-cn.php b/module/install/lang/zh-cn.php
index 0b4042c8b7..14dd84cb04 100644
--- a/module/install/lang/zh-cn.php
+++ b/module/install/lang/zh-cn.php
@@ -162,7 +162,7 @@ $lang->install->account = '管理员帐号';
$lang->install->password = '管理员密码';
$lang->install->placeholder = new stdclass();
-$lang->install->placeholder->password = '六位及以上，包含数字、字母和特殊字符';
+$lang->install->placeholder->password = '6位及以上，包含大小写字母，数字。';
$lang->install->errorEmpty['company'] = "{$lang->install->company}不能为空";
$lang->install->errorEmpty['account'] = "{$lang->install->account}不能为空";
diff --git a/module/install/model.php b/module/install/model.php
index 8d4b8d65c3..4d4d302c96 100644
--- a/module/install/model.php
+++ b/module/install/model.php
@@ -516,14 +516,13 @@ class installModel extends model
}
}
+ $this->loadModel('user');
+ $this->app->loadConfig('admin');
/* Check password. */
if(!validater::checkReg($this->post->password, '|(.){6,}|')) dao::$errors['password'][] = $this->lang->error->passwordrule;
- if(isset($this->config->safe->mode) and (strlen($this->post->password) < $this->config->safe->mode)) dao::$errors['password'][] = $this->lang->user->weakPassword;
- if(!empty($this->config->safe->changeWeak))
- {
- if(!isset($this->config->safe->weak)) $this->app->loadConfig('admin');
- if(strpos(",{$this->config->safe->weak},", ",{$this->post->password},") !== false) dao::$errors['password'][] = sprintf($this->lang->user->errorWeak, $this->config->safe->weak);
- }
+ if($this->user->computePasswordStrength($this->post->password) < 1) dao::$errors['password'][] = $this->lang->user->placeholder->passwordStrengthCheck[1];
+ if(!isset($this->config->safe->weak)) $this->app->loadConfig('admin');
+ if(strpos(",{$this->config->safe->weak},", ",{$this->post->password},") !== false) dao::$errors['password'] = sprintf($this->lang->user->errorWeak, $this->config->safe->weak);
if(dao::isError()) return false;
/* Insert a company. */
diff --git a/module/jenkins/config.php b/module/jenkins/config.php
index 874d71aea1..f86ffd1b7c 100644
--- a/module/jenkins/config.php
+++ b/module/jenkins/config.php
@@ -1,5 +1,5 @@
jenkins->create = new stdclass();
$config->jenkins->edit = new stdclass();
-$config->jenkins->create->requiredFields = 'name,url';
-$config->jenkins->edit->requiredFields = 'name,url';
+$config->jenkins->create->requiredFields = 'name,url,account';
+$config->jenkins->edit->requiredFields = 'name,url,account';
diff --git a/module/job/control.php b/module/job/control.php
index f6440f3af3..3a2b28a1e1 100644
--- a/module/job/control.php
+++ b/module/job/control.php
@@ -49,12 +49,24 @@ class job extends control
$pager = new pager($recTotal, $recPerPage, $pageID);
$this->app->loadLang('compile');
- $this->view->jobList = $this->job->getList($repoID, $orderBy, $pager);
+ $jobList = $this->job->getList($repoID, $orderBy, $pager);
+ $this->loadModel('gitlab');
+ foreach($jobList as $job)
+ {
+ $job->canExec = true;
+ if($job->engine == 'gitlab')
+ {
+ $pipeline = json_decode($job->pipeline);
+ $branch = $this->gitlab->apiGetSingleBranch($job->server, $pipeline->project, $pipeline->reference);
+ if($branch and isset($branch->can_push) and !$branch->can_push) $job->canExec = false;
+ }
+ }
$this->view->title = $this->lang->ci->job . $this->lang->colon . $this->lang->job->browse;
$this->view->position[] = $this->lang->ci->job;
$this->view->position[] = $this->lang->job->browse;
$this->view->repoID = $repoID;
+ $this->view->jobList = $jobList;
$this->view->orderBy = $orderBy;
$this->view->pager = $pager;
diff --git a/module/job/css/create.css b/module/job/css/create.css
index a70ae4bc4d..188dd0855c 100644
--- a/module/job/css/create.css
+++ b/module/job/css/create.css
@@ -5,6 +5,6 @@
#server_chosen .chosen-single {border-right: 0px;}
#pipelineBox {width: 385px;}
#svnDirBox .input-group {width: unset !important;}
-#paramDiv .input-group {padding: 3px;}
+#jenkinsServerTR .input-group-addon {border-left-width: 0 !important;}
.chosen-container .chosen-drop{z-index: 1100;} /* from c20b7e7a5 */
diff --git a/module/job/css/edit.css b/module/job/css/edit.css
index 2eaabdfeb4..57c8a09567 100644
--- a/module/job/css/edit.css
+++ b/module/job/css/edit.css
@@ -5,4 +5,4 @@
#server_chosen .chosen-single {border-right: 0px;}
#pipelineBox {width: 385px;}
#svnDirBox .input-group {width: unset !important;}
-#paramDiv .input-group {padding: 3px;}
+#jenkinsServerTR .input-group-addon {border-left-width: 0 !important;}
diff --git a/module/job/model.php b/module/job/model.php
index c3d53774e7..7bae1cf900 100644
--- a/module/job/model.php
+++ b/module/job/model.php
@@ -181,6 +181,15 @@ class jobModel extends model
{
$repo = $this->loadModel('repo')->getRepoByID($job->repo);
$project = zget($repo, 'project');
+ if(!empty($repo))
+ {
+ $pipeline = $this->loadModel('gitlab')->apiGetPipeline($repo->serviceHost, $repo->serviceProject, $this->post->reference);
+ if(!is_array($pipeline) or empty($pipeline))
+ {
+ dao::$errors['repo'] = $this->lang->job->engineTips->error;
+ return false;
+ }
+ }
$job->server = (int)zget($repo, 'serviceHost', 0);
$job->pipeline = json_encode(array('project' => $project, 'reference' => $this->post->reference));
@@ -298,6 +307,15 @@ class jobModel extends model
{
$repo = $this->loadModel('repo')->getRepoByID($job->gitlabRepo);
$project = zget($repo, 'project');
+ if(!empty($repo))
+ {
+ $pipeline = $this->loadModel('gitlab')->apiGetPipeline($repo->serviceHost, $repo->serviceProject, $this->post->reference);
+ if(!is_array($pipeline) or empty($pipeline))
+ {
+ dao::$errors['repo'] = $this->lang->job->engineTips->error;
+ return false;
+ }
+ }
$job->repo = $job->gitlabRepo;
$job->server = (int)zget($repo, 'serviceHost', 0);
diff --git a/module/job/view/browse.html.php b/module/job/view/browse.html.php
index 0a1e92e209..34daa1d6bc 100644
--- a/module/job/view/browse.html.php
+++ b/module/job/view/browse.html.php
@@ -74,7 +74,7 @@
repo}&jobID=$id", '', 'list', 'history');
common::printIcon('job', 'edit', "jobID=$id", '', 'list', 'edit');
- common::printIcon('job', 'exec', "jobID=$id", '', 'list', 'play');
+ common::printIcon('job', 'exec', "jobID=$id", '', 'list', 'play', '', $job->canExec ? '' : 'disabled');
if(common::hasPriv('job', 'delete')) echo html::a($this->createLink('job', 'delete', "jobID=$id"), '', 'hiddenwin', "title='{$lang->job->delete}' class='btn'");
?>
diff --git a/module/job/view/create.html.php b/module/job/view/create.html.php
index fddeb4505b..5bdd794655 100644
--- a/module/job/view/create.html.php
+++ b/module/job/view/create.html.php
@@ -62,7 +62,7 @@
+
+
+
+
+
- job->paramName; ?>
+ '>job->paramName; ?>
- job->paramValue; ?>
+ '>job->paramValue; ?>
job->paramValueList, '', "class='form-control' onchange='setParamName(this)'"); ?>
diff --git a/module/job/view/edit.html.php b/module/job/view/edit.html.php
index 15bd823043..82398bcdd7 100644
--- a/module/job/view/edit.html.php
+++ b/module/job/view/edit.html.php
@@ -63,7 +63,7 @@
job->triggerType;?>
job->triggerTypeList['tag'] = $lang->job->dirChange;?>
- job->triggerTypeList, $job->triggerType, "class='form-control'");?>
+ job->triggerTypeList, $job->triggerType, "class='form-control chosen'");?>
@@ -170,9 +170,9 @@
- job->paramName;?>
+ '>job->paramName; ?>
- job->paramValue;?>
+ '>job->paramValue; ?>
job->paramValueList, '', "class='form-control' onchange='setParamName(this)'");?>
diff --git a/module/kanban/model.php b/module/kanban/model.php
index 020e6ab7d9..a0e0f05747 100755
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -1664,6 +1664,7 @@ class kanbanModel extends model
if(in_array($groupBy, array('type', 'category', 'source')) and $object->$groupBy !== $laneID) continue;
if($groupBy == 'assignedTo')
{
+ $laneID = (string)$laneID;
if(empty($object->team) and $object->$groupBy !== $laneID) continue;
if(!empty($object->team) and !in_array($laneID, array_keys($object->team), true)) continue;
diff --git a/module/mr/config.php b/module/mr/config.php
index 3ffe3fd9bd..b0cb590a0b 100644
--- a/module/mr/config.php
+++ b/module/mr/config.php
@@ -33,4 +33,4 @@ $config->mrapproval->create = new stdclass();
$config->mrapproval->create->skippedFields = '';
$config->mrapproval->create->requiredFields = 'mrID,account,date,action';
-$config->mr->gitServiceList = array('gitlab', 'gitea');
+$config->mr->gitServiceList = array('gitlab', 'gitea', 'gogs');
diff --git a/module/mr/control.php b/module/mr/control.php
index b9494df0ef..37fde7fcb8 100644
--- a/module/mr/control.php
+++ b/module/mr/control.php
@@ -34,7 +34,7 @@ class mr extends control
$this->app->loadClass('pager', $static = true);
$pager = new pager($recTotal, $recPerPage, $pageID);
- $repos = $this->loadModel('repo')->getListBySCM(array('Gitlab', 'Gitea'));
+ $repos = $this->loadModel('repo')->getListBySCM(array('Gitlab', 'Gitea', 'Gogs'));
if(empty($repos)) $this->locate($this->repo->createLink('create'));
$repoID = $this->repo->saveState($repoID, $objectID);
@@ -69,10 +69,14 @@ class mr extends control
{
$openIDList = $this->loadModel('gitlab')->getGitLabListByAccount($this->app->user->account);
}
- else
+ elseif($repo->SCM == 'Gitea')
{
$openIDList = $this->loadModel('gitea')->getGiteaListByAccount($this->app->user->account);
}
+ elseif($repo->SCM == 'Gogs')
+ {
+ $openIDList = $this->loadModel('gogs')->getGogsListByAccount($this->app->user->account);
+ }
}
$this->view->title = $this->lang->mr->common . $this->lang->colon . $this->lang->mr->browse;
@@ -108,22 +112,26 @@ class mr extends control
$repoID = $this->loadModel('repo')->saveState(0);
$repo = $this->repo->getRepoByID($repoID);
+ $this->loadModel('gitlab');
$this->loadModel('gitea');
+ $this->loadModel('gogs');
if($repo->SCM == 'Gitea')
{
$project = $this->gitea->apiGetSingleProject($repo->gitService, $repo->project);
if(empty($project) or !$project->allow_merge_commits) $repo = array();
}
- $hosts = $this->loadModel('pipeline')->getList(array('gitea', 'gitlab'));
+ $hosts = $this->loadModel('pipeline')->getList(array('gitea', 'gitlab', 'gogs'));
if(!$this->app->user->admin)
{
- $gitlabUsers = $this->loadModel('gitlab')->getGitLabListByAccount();
+ $gitlabUsers = $this->gitlab->getGitLabListByAccount();
$giteaUsers = $this->gitea->getGiteaListByAccount();
+ $gogsUsers = $this->gogs->getGogsListByAccount();
foreach($hosts as $hostID => $host)
{
if($host->type == 'gitlab' and isset($gitlabUsers[$hostID])) continue;
- if($host->type == 'gitea' and isset($giteaUsers[$hostID])) continue;
+ if($host->type == 'gitea' and isset($giteaUsers[$hostID])) continue;
+ if($host->type == 'gogs' and isset($gogsUsers[$hostID])) continue;
unset($hosts[$hostID]);
}
@@ -243,6 +251,7 @@ class mr extends control
if(isset($res->message)) return print(js::alert($this->mr->convertApiError($res->message)));
}
$this->dao->delete()->from(TABLE_MR)->where('id')->eq($MRID)->exec();
+ $this->loadModel('action')->create('mr', $MRID, 'deleted', '', $MR->title);
echo js::locate(inlink('browse'), 'parent');
}
@@ -359,7 +368,7 @@ class mr extends control
}
}
- if(isset($MR->hostID)) $rawMR = $this->mr->apiAcceptMR($MR->hostID, $MR->targetProject, $MR->mriid, $MR);
+ if(isset($MR->hostID)) $rawMR = $this->mr->apiAcceptMR($MR);
if(isset($rawMR->state) and $rawMR->state == 'merged')
{
$this->mr->logMergedAction($MR);
@@ -621,7 +630,7 @@ class mr extends control
$this->loadModel('search')->setSearchParams($this->config->product->search);
$MR = $this->mr->getByID($MRID);
- $relatedStories = $this->mr->getCommitedLink($MR->hostID, $MR->targetProject, $MR->mriid, 'story');
+ $relatedStories = $this->mr->getCommitedLink($MR, 'story');
$linkedStories = $this->mr->getLinkList($MRID, $product->id, 'story');
if($browseType == 'bySearch')
@@ -706,7 +715,7 @@ class mr extends control
$this->loadModel('search')->setSearchParams($this->config->bug->search);
$MR = $this->mr->getByID($MRID);
- $relatedBugs = $this->mr->getCommitedLink($MR->hostID, $MR->targetProject, $MR->mriid, 'bug');
+ $relatedBugs = $this->mr->getCommitedLink($MR, 'bug');
$linkedBugs = $this->mr->getLinkList($MRID, $product->id, 'bug');
if($browseType == 'bySearch')
@@ -778,7 +787,7 @@ class mr extends control
$this->loadModel('search')->setSearchParams($this->config->execution->search);
$MR = $this->mr->getByID($MRID);
- $relatedTasks = $this->mr->getCommitedLink($MR->hostID, $MR->targetProject, $MR->mriid, 'task');
+ $relatedTasks = $this->mr->getCommitedLink($MR, 'task');
$linkedTasks = $this->mr->getLinkList($MRID, $product->id, 'task');
/* Get executions by product. */
@@ -1036,7 +1045,7 @@ class mr extends control
$targetBranch = $this->post->targetBranch;
$result = $this->mr->checkSameOpened($hostID, $sourceProject, $sourceBranch, $targetProject, $targetBranch);
- echo json_encode($result);
+ return print(json_encode($result));
}
/**
@@ -1051,11 +1060,11 @@ class mr extends control
{
$host = $this->loadModel('pipeline')->getByID($hostID);
$scm = $host->type;
- if($scm == 'gitea') $project = urldecode(base64_decode($project));
+ if(in_array($scm, array('gitea', 'gogs'))) $project = urldecode(base64_decode($project));
- $branches = $this->loadModel($scm)->apiGetBranchPrivs($hostID, $project);
$branchPrivs = array();
+ $branches = $this->loadModel($scm)->apiGetBranchPrivs($hostID, $project);
foreach($branches as $branch) $branchPrivs[$branch->name] = $branch->name;
- echo json_encode($branchPrivs);
+ return print(json_encode($branchPrivs));
}
}
diff --git a/module/mr/js/create.js b/module/mr/js/create.js
index 316ecb0368..5c237ca2f6 100644
--- a/module/mr/js/create.js
+++ b/module/mr/js/create.js
@@ -156,10 +156,14 @@ $(function()
{
var url = createLink('repo', 'ajaxGetGitlabProjects', "gitlabID=" + hostID + "&projectIdList=&filter=IS_DEVELOPER");
}
- else
+ else if(hosts[hostID].type == 'gitea')
{
var url = createLink('repo', 'ajaxGetGiteaProjects', "giteaID=" + hostID);
}
+ else if(hosts[hostID].type == 'gogs')
+ {
+ var url = createLink('repo', 'ajaxGetGogsProjects', "gogsID=" + hostID);
+ }
$.get(url, function(response)
{
if(response == "" && confirm(mrLang.addForApp) == true) window.open(hosts[hostID].url);
diff --git a/module/mr/model.php b/module/mr/model.php
index e85a33f5a6..7506d041d3 100644
--- a/module/mr/model.php
+++ b/module/mr/model.php
@@ -126,6 +126,19 @@ class mrModel extends model
return array($hostID => array_column($projects, null, 'full_name'));
}
+ /**
+ * Get gogs projects.
+ *
+ * @param int $hostID
+ * @access public
+ * @return array
+ */
+ public function getGogsProjects($hostID = 0)
+ {
+ $projects = $this->loadModel('gogs')->apiGetProjects($hostID);
+ return array($hostID => array_column($projects, null, 'full_name'));
+ }
+
/**
* Get gitlab projects.
*
@@ -424,9 +437,9 @@ class mrModel extends model
{
$gitUsers = $this->loadModel('gitlab')->getUserIdAccountPairs($MR->hostID);
}
- elseif($rawMR->gitService == 'gitea')
+ else
{
- $gitUsers = $this->loadModel('gitea')->getUserAccountIdPairs($MR->hostID, 'openID,account');
+ $gitUsers = $this->loadModel($rawMR->gitService)->getUserAccountIdPairs($MR->hostID, 'openID,account');
}
$newMR = new stdclass;
@@ -472,6 +485,7 @@ class mrModel extends model
$this->loadModel('gitlab');
$this->loadModel('gitea');
+ $this->loadModel('gogs');
foreach($MRList as $key => $MR)
{
if($MR->status != 'opened') continue;
@@ -499,7 +513,8 @@ class mrModel extends model
}
else
{
- $users = $this->gitea->getUserAccountIdPairs($MR->hostID, 'openID,account');
+ $scm = strtolower($scm);
+ $users = $this->$scm->getUserAccountIdPairs($MR->hostID, 'openID,account');
}
$newMR = new stdclass;
@@ -657,21 +672,21 @@ class mrModel extends model
}
return json_decode(commonModel::http($url, $MRObject));
}
- else
+ elseif(in_array($host->type, array('gitea', 'gogs')))
{
- $url = sprintf($this->loadModel('gitea')->getApiRoot($hostID), "/repos/$projectID/pulls");
+ $url = sprintf($this->loadModel($host->type)->getApiRoot($hostID), "/repos/$projectID/pulls");
$MRObject->head = $MR->sourceBranch;
$MRObject->base = $MR->targetBranch;
$MRObject->body = $MR->description;
if($MR->assignee)
{
- $assignee = $this->gitea->getUserIDByZentaoAccount($this->post->hostID, $MR->assignee);
+ $assignee = $this->{$host->type}->getUserIDByZentaoAccount($this->post->hostID, $MR->assignee);
if($assignee) $MRObject->assignee = $assignee;
}
$mergeResult = json_decode(commonModel::http($url, $MRObject));
- if(isset($mergeResult->number)) $mergeResult->iid = $mergeResult->number;
+ if(isset($mergeResult->number)) $mergeResult->iid = $host->type == 'gitea' ? $mergeResult->number : $mergeResult->id;
if(isset($mergeResult->mergeable))
{
if($mergeResult->mergeable) $mergeResult->merge_status = 'can_be_merged';
@@ -722,6 +737,22 @@ class mrModel extends model
$MR->target_project_id = $projectID;
}
}
+ elseif($scm == 'Gogs')
+ {
+ foreach($response as $MR)
+ {
+ $MR->iid = $MR->id;
+ $MR->state = $MR->state == 'open' ? 'opened' : $MR->state;
+ if($MR->merged) $MR->state = 'merged';
+
+ $MR->merge_status = $MR->mergeable ? 'can_be_merged' : 'cannot_be_merged';
+ $MR->description = $MR->body;
+ $MR->target_branch = $MR->base_branch;
+ $MR->source_branch = $MR->head_branch;
+ $MR->source_project_id = $projectID;
+ $MR->target_project_id = $projectID;
+ }
+ }
return $response;
}
@@ -773,7 +804,7 @@ class mrModel extends model
$url = sprintf($this->gitlab->getApiRoot($hostID), "/projects/$projectID/merge_requests/$MRID");
$MR = json_decode(commonModel::http($url));
}
- else
+ else if($host->type == 'gitea')
{
$url = sprintf($this->loadModel('gitea')->getApiRoot($hostID), "/repos/$projectID/pulls/$MRID");
$MR = json_decode(commonModel::http($url));
@@ -796,6 +827,29 @@ class mrModel extends model
$MR->has_conflicts = empty($diff) ? true : false;
}
}
+ else if($host->type == 'gogs')
+ {
+ $url = sprintf($this->loadModel('gogs')->getApiRoot($hostID), "/repos/$projectID/pulls/$MRID");
+ $MR = json_decode(commonModel::http($url));
+ if(isset($MR->html_url))
+ {
+ $diff = $this->apiGetDiffs($hostID, $projectID, $MRID);
+
+ $MR->web_url = $MR->html_url;
+ $MR->iid = $MR->id;
+ $MR->state = $MR->state == 'open' ? 'opened' : $MR->state;
+ if($MR->merged) $MR->state = 'merged';
+
+ $MR->merge_status = $MR->mergeable ? 'can_be_merged' : 'cannot_be_merged';
+ $MR->changes_count = empty($diff) ? 0 : 1;
+ $MR->description = $MR->body;
+ $MR->target_branch = $MR->base_branch;
+ $MR->source_branch = $MR->head_branch;
+ $MR->source_project_id = $projectID;
+ $MR->target_project_id = $projectID;
+ $MR->has_conflicts = empty($diff) ? true : false;
+ }
+ }
$MR->gitService = $host->type;
return $MR;
@@ -849,18 +903,18 @@ class mrModel extends model
}
else
{
- $url = sprintf($this->loadModel('gitea')->getApiRoot($hostID), "/repos/$projectID/pulls/$MRID");
+ $url = sprintf($this->loadModel($host->type)->getApiRoot($hostID), "/repos/$projectID/pulls/$MRID");
$newMR->base = $MR->targetBranch;
$newMR->body = $MR->description;
if($MR->assignee)
{
- $assignee = $this->gitea->getUserIDByZentaoAccount($this->post->hostID, $MR->assignee);
+ $assignee = $this->{$host->type}->getUserIDByZentaoAccount($this->post->hostID, $MR->assignee);
if($assignee) $newMR->assignee = $assignee;
}
$mergeResult = json_decode(commonModel::http($url, $newMR, array(), array(), 'json', 'PATCH'));
- if(isset($mergeResult->number)) $mergeResult->iid = $mergeResult->number;
+ if(isset($mergeResult->number)) $mergeResult->iid = $host->type == 'gitea' ? $mergeResult->number : $mergeResult->id;
if(isset($mergeResult->mergeable))
{
if($mergeResult->mergeable) $mergeResult->merge_status = 'can_be_merged';
@@ -923,7 +977,7 @@ class mrModel extends model
}
else
{
- $url = sprintf($this->loadModel('gitea')->getApiRoot($hostID), "/repos/$projectID/pulls/$MRID");
+ $url = sprintf($this->loadModel($host->type)->getApiRoot($hostID), "/repos/$projectID/pulls/$MRID");
return json_decode(commonModel::http($url, array('state' => 'closed'), array(), array(), 'json', 'PATCH'));
}
}
@@ -946,7 +1000,7 @@ class mrModel extends model
$url = sprintf($this->gitlab->getApiRoot($hostID), "/projects/$projectID/merge_requests/$MRID") . '&state_event=reopen';
return json_decode(commonModel::http($url, null, array(CURLOPT_CUSTOMREQUEST => 'PUT')));
}
- else
+ elseif($host->type == 'gitea')
{
$url = sprintf($this->loadModel('gitea')->getApiRoot($hostID), "/repos/$projectID/pulls/$MRID");
$MR = json_decode(commonModel::http($url, array('state' => 'open'), array(), array(), 'json', 'PATCH'));
@@ -961,6 +1015,23 @@ class mrModel extends model
$MR->source_project_id = $projectID;
$MR->target_project_id = $projectID;
+ return $MR;
+ }
+ elseif($host->type == 'gogs')
+ {
+ $url = sprintf($this->loadModel('gitea')->getApiRoot($hostID), "/repos/$projectID/pulls/$MRID");
+ $MR = json_decode(commonModel::http($url, array('state' => 'open'), array(), array(), 'json', 'PATCH'));
+ $MR->iid = $MR->id;
+ $MR->state = $MR->state == 'open' ? 'opened' : $MR->state;
+ if($MR->merged) $MR->state = 'merged';
+
+ $MR->merge_status = $MR->mergeable ? 'can_be_merged' : 'cannot_be_merged';
+ $MR->description = $MR->body;
+ $MR->target_branch = $MR->base_branch;
+ $MR->source_branch = $MR->head_branch;
+ $MR->source_project_id = $projectID;
+ $MR->target_project_id = $projectID;
+
return $MR;
}
}
@@ -968,37 +1039,37 @@ class mrModel extends model
/**
* Accept MR by API.
*
- * @link https://docs.gitlab.com/ee/api/merge_requests.html#accept-mr
- * @param int $hostID
- * @param int $projectID
- * @param int $MRID
* @param object $MR
* @access public
* @return object
*/
- public function apiAcceptMR($hostID, $projectID, $MRID, $MR = null)
+ public function apiAcceptMR($MR)
{
- $host = $this->loadModel('pipeline')->getByID($hostID);
+ $host = $this->loadModel('pipeline')->getByID($MR->hostID);
if($host->type == 'gitlab')
{
- $apiRoot = $this->gitlab->getApiRoot($hostID);
- $approveUrl = sprintf($apiRoot, "/projects/$projectID/merge_requests/$MRID/approved");
+ $apiRoot = $this->gitlab->getApiRoot($MR->hostID);
+ $approveUrl = sprintf($apiRoot, "/projects/$MR->targetProject/merge_requests/$MR->mriid/approved");
commonModel::http($approveUrl, null, array(CURLOPT_CUSTOMREQUEST => 'POST'));
- $url = sprintf($apiRoot, "/projects/$projectID/merge_requests/$MRID/merge");
+ $url = sprintf($apiRoot, "/projects/$MR->targetProject/merge_requests/$MR->mriid/merge");
return json_decode(commonModel::http($url, null, array(CURLOPT_CUSTOMREQUEST => 'PUT')));
}
- elseif($host->type == 'gitea')
+ else
{
- $apiRoot = $this->loadModel('gitea')->getApiRoot($hostID);
- $url = sprintf($apiRoot, "/repos/$projectID/pulls/$MRID/merge");
+ $apiRoot = $this->loadModel($host->type)->getApiRoot($MR->hostID);
+ $url = sprintf($apiRoot, "/repos/$MR->targetProject/pulls/$MR->mriid/merge");
$merge = ($MR and $MR->squash == '1') ? 'squash' : 'merge';
$data = array('Do' => $merge);
- if($MR and $MR->removeSourceBranch == '1') $data['delete_branch_after_merge'] = true;
+ if($MR->removeSourceBranch == '1') $data['delete_branch_after_merge'] = true;
$rowMR = json_decode(commonModel::http($url, $data, array(), array(), 'json', 'POST'));
- if(!isset($rowMR->massage)) $rowMR = $this->apiGetSingleMR($hostID, $projectID, $MRID);
+ if(!isset($rowMR->massage))
+ {
+ $rowMR = $this->apiGetSingleMR($MR->hostID, $MR->targetProject, $MR->mriid);
+ if($data['delete_branch_after_merge'] == true) $this->loadModel('gogs')->apiDeleteBranch($MR->hostID, $MR->targetProject, $MR->sourceBranch);
+ }
return $rowMR;
}
@@ -1155,29 +1226,6 @@ class mrModel extends model
return json_decode(commonModel::http($url));
}
- /**
- * Get diff commits of MR from GitLab API.
- *
- * @param int $hostID
- * @param int $projectID
- * @param int $MRID
- * @access public
- * @return object
- */
- public function apiGetDiffCommits($hostID, $projectID, $MRID)
- {
- $host = $this->loadModel('pipeline')->getByID($hostID);
- if($host->type == 'gitlab')
- {
- $url = sprintf($this->gitlab->getApiRoot($hostID), "/projects/$projectID/merge_requests/$MRID/commits");
- }
- else
- {
- $url = sprintf($this->loadModel('gitea')->getApiRoot($hostID), "/repos/$projectID/pulls/$MRID/commits");
- }
- return json_decode(commonModel::http($url));
- }
-
/**
* Get diff of MR from Gitea API.
*
@@ -1666,6 +1714,33 @@ class mrModel extends model
->fetchPairs();
}
+ /**
+ * Get diff commits of MR.
+ *
+ * @param object $MR
+ * @access public
+ * @return array
+ */
+ public function getDiffCommits($MR)
+ {
+ $host = $this->loadModel('pipeline')->getByID($MR->hostID);
+ if($host->type == 'gogs')
+ {
+ $repo = $this->loadModel('repo')->getRepoByID($MR->repoID);
+ $scm = $this->app->loadClass('scm');
+ $scm->setEngine($repo);
+ return $scm->getMRCommits($MR->sourceBranch, $MR->targetBranch);
+ }
+ else
+ {
+ $projectID = $MR->targetProject;
+ $MRID = $MR->mriid;
+ 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));
+ }
+ }
+
/**
* Create an mr link.
*
@@ -1797,21 +1872,19 @@ class mrModel extends model
/**
* Get links by mr commites.
*
- * @param int $hostID
- * @param int $projectID
- * @param int $MRID
- * @param string $type
+ * @param object $MR
+ * @param string $type
* @access public
* @return array
*/
- public function getCommitedLink($hostID, $projectID, $MRID, $type)
+ public function getCommitedLink($MR, $type)
{
- $DiffCommits = $this->apiGetDiffCommits($hostID, $projectID, $MRID);
+ $diffCommits = $this->getDiffCommits($MR);
$commits = array();
- foreach($DiffCommits as $DiffCommit)
+ foreach($diffCommits as $diffCommit)
{
- if(isset($DiffCommit->id)) $commits[] = substr($DiffCommit->id, 0, 10);
+ if(isset($diffCommit->id)) $commits[] = substr($diffCommit->id, 0, 10);
}
return $this->dao->select('objectID')->from(TABLE_ACTION)->where('objectType')->eq($type)->andWhere('extra')->in($commits)->fetchPairs('objectID');
@@ -1863,7 +1936,7 @@ class mrModel extends model
*/
public function logMergedAction($MR)
{
- $this->loadModel('action')->create('mr', $MR->id, 'merged');
+ $this->loadModel('action')->create('mr', $MR->id, 'mergedmr');
$product = $this->getMRProduct($MR);
$stories = $this->getLinkList($MR->id, $product->id, 'story');
diff --git a/module/mr/view/browse.html.php b/module/mr/view/browse.html.php
index 5bf5ff0f78..a290054b81 100644
--- a/module/mr/view/browse.html.php
+++ b/module/mr/view/browse.html.php
@@ -91,17 +91,21 @@
createdDate;?>
user->admin or (isset($projects[$MR->hostID][$MR->sourceProject]->owner->id) and $projects[$MR->hostID][$MR->sourceProject]->owner->id == $openIDList[$MR->hostID])) ? '' : 'disabled';
+ $canDelete = ($app->user->admin or (isset($openIDList[$MR->hostID]) and isset($projects[$MR->hostID][$MR->sourceProject]->owner->id) and $projects[$MR->hostID][$MR->sourceProject]->owner->id == $openIDList[$MR->hostID])) ? '' : 'disabled';
if($repo->SCM == 'Gitlab')
{
$canEdit = (isset($projects[$MR->hostID][$MR->sourceProject]->isDeveloper) and $projects[$MR->hostID][$MR->sourceProject]->isDeveloper == true) ? '' : 'disabled';
}
- else
+ elseif($repo->SCM == 'Gitea')
{
$canEdit = (isset($projects[$MR->hostID][$MR->sourceProject]->allow_merge_commits) and $projects[$MR->hostID][$MR->sourceProject]->allow_merge_commits == true) ? '' : 'disabled';
}
+ elseif($repo->SCM == 'Gogs')
+ {
+ $canEdit = (isset($projects[$MR->hostID][$MR->sourceProject]->permissions->push) and $projects[$MR->hostID][$MR->sourceProject]->permissions->push) ? '' : 'disabled';
+ }
common::printLink('mr', 'view', "MRID={$MR->id}", '', '', "title='{$lang->mr->view}' class='btn btn-info'");
- common::printIcon('mr', 'edit', "MRID={$MR->id}", $MR, 'list', '', '', '', false, "{$canEdit}");
+ common::printIcon('mr', 'edit', "MRID={$MR->id}", $MR, 'list', '', '', $canEdit);
common::printLink('mr', 'diff', "MRID={$MR->id}", '', '', "title='{$lang->mr->viewDiff}' class='btn btn-info'");
common::printLink('mr', 'link', "MRID={$MR->id}", '', '', "title='{$lang->mr->link}' class='btn btn-info'" . ($MR->linkButton == false ? 'disabled' : ''));
common::printLink('mr', 'delete', "MRID={$MR->id}", '', 'hiddenwin', "title='{$lang->mr->delete}' class='btn btn-info {$canDelete}'");
diff --git a/module/mr/view/edit.html.php b/module/mr/view/edit.html.php
index f25de0ee27..f770f763fa 100644
--- a/module/mr/view/edit.html.php
+++ b/module/mr/view/edit.html.php
@@ -50,7 +50,7 @@
mr->targetProject;?>
- status == 'merged' or $MR->status == 'closed'):?>
+ status == 'merged' or $MR->status == 'closed' or $host->type == 'gogs'):?>
type == 'gitlab' ? $this->loadModel('gitlab')->apiGetSingleProject($MR->hostID, $MR->targetProject)->name_with_namespace : $MR->targetProject;?>:
targetBranch;?>
@@ -79,9 +79,13 @@
mr->removeSourceBranch;?>
+ canDeleteBranch and $MR->removeSourceBranch == '1') $attr .= 'checked ';
+ if(!$MR->canDeleteBranch) $attr .= 'disabled';
+ ?>
diff --git a/module/mr/view/link.html.php b/module/mr/view/link.html.php
index f9350b3730..57ffa878a5 100644
--- a/module/mr/view/link.html.php
+++ b/module/mr/view/link.html.php
@@ -89,7 +89,7 @@
?>
createLink('story', 'view', "storyID=$story->id");
+ $viewLink = $this->createLink('story', 'view', "storyID=$story->id", '', true);
$totalEstimate += $story->estimate;
?>
@@ -102,7 +102,7 @@
parent > 0) echo "story->children}>{$lang->story->childrenAB}";
- echo html::a($viewLink , $story->title);
+ echo html::a($viewLink , $story->title, '', 'class="iframe"');
?>
openedBy);?>
@@ -168,7 +168,7 @@
id);?>
bug->priList, $bug->pri, $bug->pri);?>
- createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?>
+ createLink('bug', 'view', "bugID=$bug->id", '', true), $bug->title, '', 'class="iframe"');?>
openedBy);?>
assignedTo);?>
@@ -230,7 +230,7 @@
id);?>
task->priList, $task->pri, $task->pri);?>
- createLink('task', 'view', "taskID=$task->id"), $task->name);?>
+ createLink('task', 'view', "taskID=$task->id", '', true), $task->name, '', 'class="iframe"');?>
finishedBy);?>
assignedTo);?>
diff --git a/module/my/view/changepassword.html.php b/module/my/view/changepassword.html.php
index 42cd5db2e3..4fc172707a 100755
--- a/module/my/view/changepassword.html.php
+++ b/module/my/view/changepassword.html.php
@@ -54,8 +54,9 @@
app->user->modifyPasswordReason)):?>
app->loadLang('admin');?>
- canDeleteBranch and $MR->removeSourceBranch== '1' ? 'checked' : '' ?>
- canDeleteBranch) echo 'disabled';?> name="removeSourceBranch" value="1" id="removeSourceBranch">
+ name="removeSourceBranch" value="1" id="removeSourceBranch">
+ app->user->modifyPasswordReason;?>
admin->safe->common . ' : ';?>
- app->user->modifyPasswordReason == 'weak' ? $lang->admin->safe->changeWeak : $lang->admin->safe->modifyPasswordFirstLogin;?>
+ admin->safe->changeWeak : $lang->admin->safe->$reason;?>
diff --git a/module/pipeline/lang/de.php b/module/pipeline/lang/de.php
index c3a226f3fd..34072e6ece 100644
--- a/module/pipeline/lang/de.php
+++ b/module/pipeline/lang/de.php
@@ -5,3 +5,4 @@ $lang->pipeline->url = 'Server URL';
$lang->pipeline->token = 'Token';
$lang->pipeline->account = 'Username';
$lang->pipeline->password = 'Password';
+$lang->pipeline->delError = 'The server has some repos, please delete them and operate';
diff --git a/module/pipeline/lang/en.php b/module/pipeline/lang/en.php
index c3a226f3fd..34072e6ece 100644
--- a/module/pipeline/lang/en.php
+++ b/module/pipeline/lang/en.php
@@ -5,3 +5,4 @@ $lang->pipeline->url = 'Server URL';
$lang->pipeline->token = 'Token';
$lang->pipeline->account = 'Username';
$lang->pipeline->password = 'Password';
+$lang->pipeline->delError = 'The server has some repos, please delete them and operate';
diff --git a/module/pipeline/lang/fr.php b/module/pipeline/lang/fr.php
index c3a226f3fd..34072e6ece 100644
--- a/module/pipeline/lang/fr.php
+++ b/module/pipeline/lang/fr.php
@@ -5,3 +5,4 @@ $lang->pipeline->url = 'Server URL';
$lang->pipeline->token = 'Token';
$lang->pipeline->account = 'Username';
$lang->pipeline->password = 'Password';
+$lang->pipeline->delError = 'The server has some repos, please delete them and operate';
diff --git a/module/pipeline/lang/vi.php b/module/pipeline/lang/vi.php
index c3a226f3fd..34072e6ece 100644
--- a/module/pipeline/lang/vi.php
+++ b/module/pipeline/lang/vi.php
@@ -5,3 +5,4 @@ $lang->pipeline->url = 'Server URL';
$lang->pipeline->token = 'Token';
$lang->pipeline->account = 'Username';
$lang->pipeline->password = 'Password';
+$lang->pipeline->delError = 'The server has some repos, please delete them and operate';
diff --git a/module/pipeline/lang/zh-cn.php b/module/pipeline/lang/zh-cn.php
index bef6c98880..75d1d9a52f 100644
--- a/module/pipeline/lang/zh-cn.php
+++ b/module/pipeline/lang/zh-cn.php
@@ -5,3 +5,4 @@ $lang->pipeline->url = '服务器地址';
$lang->pipeline->token = 'Token';
$lang->pipeline->account = '用户名';
$lang->pipeline->password = '密码';
+$lang->pipeline->delError = '当前服务器下有代码库，请删除代码库后操作';
diff --git a/module/pipeline/model.php b/module/pipeline/model.php
index 3d858314f2..b6b2e9274c 100644
--- a/module/pipeline/model.php
+++ b/module/pipeline/model.php
@@ -87,6 +87,9 @@ class pipelineModel extends model
->batchCheck($this->config->pipeline->create->requiredFields, 'notempty')
->batchCheck("url", 'URL')
->check('name', 'unique', "`type` = '$type'")
+ ->checkIF($type == 'jenkins', 'account', 'notempty')
+ ->checkIF($type == 'jenkins' and !$pipeline->token, 'password', 'notempty')
+ ->checkIF($type == 'jenkins' and !$pipeline->password, 'token', 'notempty')
->autoCheck()
->exec();
if(dao::isError()) return false;
@@ -118,6 +121,9 @@ class pipelineModel extends model
->batchCheck($this->config->pipeline->edit->requiredFields, 'notempty')
->batchCheck("url", 'URL')
->check('name', 'unique', "`type` = '$type' and id <> $id")
+ ->checkIF($type == 'jenkins', 'account', 'notempty')
+ ->checkIF($type == 'jenkins' and !$pipeline->token, 'password', 'notempty')
+ ->checkIF($type == 'jenkins' and !$pipeline->password, 'token', 'notempty')
->autoCheck()
->where('id')->eq($id)
->exec();
@@ -131,10 +137,28 @@ class pipelineModel extends model
* @param string $id the id to be deleted
* @param string $object the action object
* @access public
- * @return int
+ * @return int|bool
*/
public function delete($id, $object = 'gitlab')
{
+ if(in_array($object, array('gitlab', 'gitea', 'gogs')))
+ {
+ $repo = $this->dao->select('*')->from(TABLE_REPO)
+ ->where('deleted')->eq('0')
+ ->andWhere('SCM')->eq(ucfirst($object))
+ ->andWhere('serviceHost')->eq($id)
+ ->fetch();
+ if($repo) return false;
+ }
+ elseif($object == 'sonarqube')
+ {
+ $job = $this->dao->select('id,name,repo,deleted')->from(TABLE_JOB)
+ ->where('frame')->eq('sonarqube')
+ ->andWhere('server')->eq($id)
+ ->andWhere('deleted')->eq('0')
+ ->fetch();
+ if($job) return false;
+ }
$this->dao->update(TABLE_PIPELINE)->set('deleted')->eq(1)->where('id')->eq($id)->exec();
$this->loadModel('action')->create($object, $id, 'deleted', '', ACTIONMODEL::CAN_UNDELETED);
diff --git a/module/port/view/footer.html.php b/module/port/view/footer.html.php
index 6fd32ded84..38c6c2541d 100644
--- a/module/port/view/footer.html.php
+++ b/module/port/view/footer.html.php
@@ -1,5 +1,5 @@