Merge branch 'devops20'

This commit is contained in:
liyuchun
2022-01-25 16:55:51 +08:00
35 changed files with 733 additions and 150 deletions

View File

@@ -320,9 +320,9 @@ class jobModel extends model
if(!empty($job->projectKey) and $job->frame == 'sonarqube')
{
$projectList = $this->getJobBySonarqubeProject($job->sonarqubeServer, array($job->projectKey));
if(!empty($projectList) && $projectList[$job->projectKey]->id != $id)
if(!empty($projectList) && $projectList[$job->projectKey] != $id)
{
$message = sprintf($this->lang->job->projectExists, $projectList[$job->projectKey]->id);
$message = sprintf($this->lang->job->projectExists, $projectList[$job->projectKey]);
dao::$errors[]['projectKey'] = $message;
return false;
}