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

* Move die to return.

Browse Source
This commit is contained in:
zhujinyong
2022-02-22 09:02:00 +08:00
parent b17c3c8206
commit 002e215a3d
11 changed files with 122 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
module/job/control.php
View File

@@ -219,10 +219,10 @@ class job extends control
*/
public function delete($id, $confirm = 'no')
{
if($confirm != 'yes') die(js::confirm($this->lang->job->confirmDelete, inlink('delete', "jobID=$id&confirm=yes")));
if($confirm != 'yes') return print(js::confirm($this->lang->job->confirmDelete, inlink('delete', "jobID=$id&confirm=yes")));
$this->job->delete(TABLE_JOB, $id);
die(js::reload('parent'));
echo js::reload('parent');
}
/**
@@ -343,7 +343,7 @@ class job extends control
public function ajaxGetProductByRepo($repoID)
{
$repo = $this->loadModel('repo')->getRepoByID($repoID);
if(empty($repo)) die(json_encode(array(""=>"")));
if(empty($repo)) return print(json_encode(array(""=>"")));
$product = $repo->product;
if(strpos($product, ','))
@@ -359,11 +359,11 @@ class job extends control
if($productLeft == $productRight) $matchedProducts[$productName] = $productRight;
}
}
die(json_encode($matchedProducts));
return print(json_encode($matchedProducts));
}
$productName = $this->loadModel('product')->getByID($repo->product)->name;
die(json_encode(array($productName => $repo->product)));
ehco json_encode(array($productName => $repo->product));
}
/**
@@ -405,7 +405,6 @@ class job extends control
}
}
echo html::select('repo', $repoPairs, '', "class='form-control chosen'");
die();
}
/**
@@ -431,7 +430,7 @@ class job extends control
public function ajaxCheckSonarqubeLink($repoID, $jobID = 0)
{
$repo = $this->loadModel('job')->getSonarqubeByRepo(array($repoID), $jobID, true);
if(!empty($repo))
if(!empty($repo))
{
$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));