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

* Modify server delete tip.

Browse Source
This commit is contained in:
caoyanyi
2022-08-05 15:39:24 +08:00
parent 53919cc470
commit 0679729a7e
18 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/ci/model.php
+3 -1
View File
@@ -31,7 +31,9 @@ class ciModel extends model
$repo = $this->loadModel('repo')->getRepoByID($this->session->repoID);
if(!empty($repo) and !in_array(strtolower($repo->SCM), $this->config->repo->gitServiceList)) unset($this->lang->devops->menu->mr);
$this->lang->switcherMenu = $this->loadModel('repo')->getSwitcher($this->session->repoID);
$tab = $this->app->tab;
$repos = $this->repo->getRepoPairs($tab);
if(count($repos) > 1) $this->lang->switcherMenu = $this->loadModel('repo')->getSwitcher($this->session->repoID);
}
}
module/gitea/control.php
+1 -1
View File
@@ -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);
module/gitlab/control.php
+3 -4
View File
@@ -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);
$oldGitea = $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);
module/gogs/control.php
+1 -1
View File
@@ -141,9 +141,9 @@ class gogs extends control
{
if($confirm != 'yes') return print(js::confirm($this->lang->gogs->confirmDelete, inlink('delete', "id=$gogsID&confirm=yes")));
$oldGogs = $this->loadModel('pipeline')->getByID($gogsID);
$actionID = $this->pipeline->delete($gogsID, 'gogs');
if(!$actionID) return print(js::error($this->lang->pipeline->delError));
$gogs = $this->pipeline->getByID($gogsID);
$changes = common::createChanges($oldGogs, $gogs);
module/pipeline/lang/de.php
+1
View File
@@ -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';
module/pipeline/lang/en.php
+1
View File
@@ -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';
module/pipeline/lang/fr.php
+1
View File
@@ -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';
module/pipeline/lang/vi.php
+1
View File
@@ -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';
module/pipeline/lang/zh-cn.php
+1
View File
@@ -5,3 +5,4 @@ $lang->pipeline->url = '服务器地址';
$lang->pipeline->token = 'Token';
$lang->pipeline->account = '用户名';
$lang->pipeline->password = '密码';
$lang->pipeline->delError = '当前服务器下有代码库，请删除代码库后操作';
module/pipeline/model.php
+19 -1
View File
@@ -131,10 +131,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);
module/repo/js/create.js
-2
View File
@@ -57,14 +57,12 @@ function scmChanged(scm)
if(scm == 'Git' || scm == 'Gitea' || scm == 'Gogs')
{
$('.account-fields').addClass('hidden');
$('.tips-git').removeClass('hidden');
$('.tips-svn').addClass('hidden');
}
else
{
$('.account-fields').removeClass('hidden');
$('.tips-git').addClass('hidden');
$('.tips-svn').removeClass('hidden');
}
module/repo/model.php
+1 -1
View File
@@ -58,7 +58,7 @@ class repoModel extends model
}
if(!in_array(strtolower($repo->SCM), $this->config->repo->gitServiceList)) unset($this->lang->devops->menu->mr);
$this->lang->switcherMenu = $this->getSwitcher($repoID);
if(count($repos) > 1) $this->lang->switcherMenu = $this->getSwitcher($repoID);
}
common::setMenuVars('devops', $repoID);
module/sonarqube/control.php
+1
View File
@@ -215,6 +215,7 @@ class sonarqube extends control
$oldSonarQube = $this->loadModel('pipeline')->getByID($sonarqubeID);
$this->loadModel('action');
$actionID = $this->pipeline->delete($sonarqubeID, 'sonarqube');
if($actionID) return print(js::error($this->lang->sonarqube->delError));
$sonarQube = $this->pipeline->getByID($sonarqubeID);
$changes = common::createChanges($oldSonarQube, $sonarQube);
module/sonarqube/lang/de.php
+1
View File
@@ -16,6 +16,7 @@ $lang->sonarqube->desc = 'Description';
$lang->sonarqube->reportView = "SonarQube Report";
$lang->sonarqube->browseIssue = "SonarQube Issue List";
$lang->sonarqube->createBug = "Create Bug";
$lang->sonarqube->delError = "There are bound jobs under this server, please delete the association and then operate";
$lang->sonarqube->id = 'ID';
$lang->sonarqube->name = "Server Name";
module/sonarqube/lang/en.php
+1
View File
@@ -16,6 +16,7 @@ $lang->sonarqube->desc = 'Description';
$lang->sonarqube->reportView = "SonarQube Report";
$lang->sonarqube->browseIssue = "SonarQube Issue List";
$lang->sonarqube->createBug = "Create Bug";
$lang->sonarqube->delError = "There are bound jobs under this server, please delete the association and then operate";
$lang->sonarqube->id = 'ID';
$lang->sonarqube->name = "Server Name";
module/sonarqube/lang/fr.php
+1
View File
@@ -16,6 +16,7 @@ $lang->sonarqube->desc = 'Description';
$lang->sonarqube->reportView = "SonarQube Report";
$lang->sonarqube->browseIssue = "SonarQube Issue List";
$lang->sonarqube->createBug = "Create Bug";
$lang->sonarqube->delError = "There are bound jobs under this server, please delete the association and then operate";
$lang->sonarqube->id = 'ID';
$lang->sonarqube->name = "Server Name";
module/sonarqube/lang/vi.php
+1
View File
@@ -16,6 +16,7 @@ $lang->sonarqube->desc = 'Description';
$lang->sonarqube->reportView = "SonarQube Report";
$lang->sonarqube->browseIssue = "SonarQube Issue List";
$lang->sonarqube->createBug = "Create Bug";
$lang->sonarqube->delError = "There are bound jobs under this server, please delete the association and then operate";
$lang->sonarqube->id = 'ID';
$lang->sonarqube->name = "Server Name";
module/sonarqube/lang/zh-cn.php
+1
View File
@@ -16,6 +16,7 @@ $lang->sonarqube->desc = '描述';
$lang->sonarqube->reportView = "SonarQube报告";
$lang->sonarqube->browseIssue = "SonarQube问题列表";
$lang->sonarqube->createBug = "转bug";
$lang->sonarqube->delError = "该服务器下有绑定的构建，请删除关联之后操作";
$lang->sonarqube->id = 'ID';
$lang->sonarqube->name = "服务器名称";