From 07ba811bc2597e5ed4585152b46a11f3a87ec768 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Mon, 17 Jan 2022 01:22:51 +0000
Subject: [PATCH] * Modify trash data tips.

---
 module/job/control.php    |  4 ++--
 module/job/lang/en.php    |  1 +
 module/job/lang/zh-cn.php |  1 +
 module/job/model.php      | 10 ++++++----
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/module/job/control.php b/module/job/control.php
index 53343533dc..061d5a9195 100644
--- a/module/job/control.php
+++ b/module/job/control.php
@@ -426,10 +426,10 @@ class job extends control
      */
     public function ajaxCheckSonarqubeLink($repoID, $jobID = 0)
     {
-        $repo = $this->loadModel('job')->getSonarqubeByRepo(array($repoID), $jobID);
+        $repo = $this->loadModel('job')->getSonarqubeByRepo(array($repoID), $jobID, true);
         if(!empty($repo)) 
         {
-            $message = sprintf($this->lang->job->repoExists, $repo[$repoID]->id . '-' . $repo[$repoID]->name);
+            $message = $repo[$repoID]->deleted ? $this->lang->job->jobIsDeleted : sprintf($this->lang->job->repoExists, $repo[$repoID]->id . '-' . $repo[$repoID]->name);
             $this->send(array('result' => 'fail', 'message' => $message));
         }
         $this->send(array('result' => 'success', 'message' => ''));
diff --git a/module/job/lang/en.php b/module/job/lang/en.php
index bb21e8847e..e8b58344a5 100644
--- a/module/job/lang/en.php
+++ b/module/job/lang/en.php
@@ -59,6 +59,7 @@ $lang->job->invalidName    = 'The parameter name should be letters, numbers or u
 $lang->job->repoExists     = 'This repository has a build task associated with it『%s』';
 $lang->job->projectExists  = 'This SonarQube Project has a build task associated with it『%s』';
 $lang->job->mustUseJenkins = 'SonarQube frame is only used if the build engine is JenKins.';
+$lang->job->jobIsDeleted   = 'This repository is associated with a build task, please view the data from the recycle bin';
 
 $lang->job->buildTypeList['build']          = 'Only Build';
 $lang->job->buildTypeList['buildAndDeploy'] = 'Build And Deploy';
diff --git a/module/job/lang/zh-cn.php b/module/job/lang/zh-cn.php
index a109e455bb..5f7bb63f04 100644
--- a/module/job/lang/zh-cn.php
+++ b/module/job/lang/zh-cn.php
@@ -59,6 +59,7 @@ $lang->job->invalidName    = '参数名称应该是英文字母、数字或下
 $lang->job->repoExists     = '此版本库已关联构建任务『%s』';
 $lang->job->projectExists  = '此SonarQube项目已关联构建任务『%s』';
 $lang->job->mustUseJenkins = 'SonarQube工具/框架仅在构建引擎为JenKins的情况下使用';
+$lang->job->jobIsDeleted   = '此版本库已关联构建任务,请从回收站查看数据';
 
 $lang->job->buildTypeList['build']          = '仅构建';
 $lang->job->buildTypeList['buildAndDeploy'] = '构建部署';
diff --git a/module/job/model.php b/module/job/model.php
index 7a72790577..1e416f67da 100644
--- a/module/job/model.php
+++ b/module/job/model.php
@@ -603,15 +603,17 @@ class jobModel extends model
      * Get sonarqube by RepoID.
      *
      * @param  array  $repoIDList
+     * @param  int    $jobID
+     * @param  bool   $showDeleted
      * @access public
      * @return array
      */
-    public function getSonarqubeByRepo($repoIDList, $jobID = 0)
+    public function getSonarqubeByRepo($repoIDList, $jobID = 0, $showDeleted = false)
     {
-        return $this->dao->select('id,name,repo')->from(TABLE_JOB)
-            ->where('deleted')->eq('0')
-            ->andWhere('frame')->eq('sonarqube')
+        return $this->dao->select('id,name,repo,deleted')->from(TABLE_JOB)
+            ->where('frame')->eq('sonarqube')
             ->andWhere('repo')->in($repoIDList)
+            ->beginIF(!$showDeleted)->andWhere('deleted')->eq('0')->fi()
             ->beginIF($jobID > 0)->andWhere('id')->ne($jobID)->fi()
             ->fetchAll('repo');
     }