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

Merge branch 'devops19_47222' into 'devops19'

Browse Source 
任务47222

See merge request easycorp/zentaopms!1383
This commit is contained in:
李玉春
2022-01-13 09:09:12 +00:00
parent 23b367ceb3 2263ecf9a4
commit dc42b886bc
9 changed files with 116 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/sonarqube/control.php
+40 -4
View File
@@ -94,19 +94,24 @@ class sonarqube extends control
/**
* Check post info.
*
* @param int $sonarqubeID
* @access protected
* @return void
*/
protected function checkToken()
protected function checkToken($sonarqubeID = 0)
{
$sonarqube = fixer::input('post')->get();
$this->dao->update('sonarqube')->data($sonarqube)->batchCheck($this->config->sonarqube->create->requiredFields, 'notempty');
$this->dao->update('sonarqube')->data($sonarqube)->batchCheck(empty($sonarqubeID) ? $this->config->sonarqube->create->requiredFields : $this->config->sonarqube->edit->requiredFields, 'notempty');
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
if(strpos($sonarqube->url, 'http') !== 0) return $this->send(array('result' => 'fail', 'message' => array('url' => array($this->lang->sonarqube->hostError))));
/* Check name and url unique. */
$isExist = $this->dao->select('*')->from(TABLE_PIPELINE)->where("name='{$sonarqube->name}' or url='{$sonarqube->url}'")->fetch();
if($isExist) return $this->send(array('result' => 'fail', 'message' => $this->lang->sonarqube->repeatError));
$existSonarQube = $this->dao->select('*')->from(TABLE_PIPELINE)
->where("type='sonarqube' and (name='{$sonarqube->name}' or url='{$sonarqube->url}')")
->beginIF(!empty($sonarqubeID))->andWhere('id')->ne($sonarqubeID)->fi()
->fetch();
if(isset($existSonarQube->name) and $existSonarQube->name == $sonarqube->name) return $this->send(array('result' => 'fail', 'message' => $this->lang->sonarqube->nameRepeatError));
if(isset($existSonarQube->url) and $existSonarQube->url== $sonarqube->url) return $this->send(array('result' => 'fail', 'message' => $this->lang->sonarqube->urlRepeatError));
$token = base64_encode("{$sonarqube->account}:{$sonarqube->password}");
$result = $this->sonarqube->apiValidate($sonarqube->url, $token);
@@ -115,6 +120,37 @@ class sonarqube extends control
$this->post->set('token', $token);
}
/**
* Edit a sonarqube.
*
* @param int $sonarqubeID
* @access public
* @return void
*/
public function edit($sonarqubeID)
{
$oldSonarQube = $this->sonarqube->getByID($sonarqubeID);
if($_POST)
{
$this->checkToken($sonarqubeID);
$this->loadModel('pipeline')->update($sonarqubeID);
$sonarqube = $this->sonarqube->getByID($sonarqubeID);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
$this->loadModel('action');
$actionID = $this->action->create('sonarqube', $sonarqubeID, 'edited');
$changes = common::createChanges($oldSonarQube, $sonarqube);
$this->action->logHistory($actionID, $changes);
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse')));
}
$this->view->title = $this->lang->sonarqube->common . $this->lang->colon . $this->lang->sonarqube->editServer;
$this->view->sonarqube = $oldSonarQube;
$this->display();
}
/**
* Delete a sonarqube.
*