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

* Add program condition.

Browse Source
This commit is contained in:
sgm0422
2020-06-01 16:25:11 +08:00
parent 60e13af347
commit 3cc7f35436
4 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
module/compile/model.php
View File

@@ -40,6 +40,7 @@ class compileModel extends model
->leftJoin(TABLE_JENKINS)->alias('t4')->on('t2.jkHost=t4.id') ->leftJoin(TABLE_JENKINS)->alias('t4')->on('t2.jkHost=t4.id')
->where('t1.deleted')->eq('0') ->where('t1.deleted')->eq('0')
->andWhere('t1.job')->ne('0') ->andWhere('t1.job')->ne('0')
->andWhere('t1.program')->ne($this->session->program)
->beginIF(!empty($jobID))->andWhere('t1.job')->eq($jobID)->fi() ->beginIF(!empty($jobID))->andWhere('t1.job')->eq($jobID)->fi()
->orderBy($orderBy) ->orderBy($orderBy)
->page($pager) ->page($pager)

6
module/jenkins/model.php
View File

@@ -39,6 +39,7 @@ class jenkinsModel extends model
{ {
return $this->dao->select('*')->from(TABLE_JENKINS) return $this->dao->select('*')->from(TABLE_JENKINS)
->where('deleted')->eq('0') ->where('deleted')->eq('0')
->andWhere('program')->eq($this->session->program)
->orderBy($orderBy) ->orderBy($orderBy)
->page($pager) ->page($pager)
->fetchAll('id'); ->fetchAll('id');
@@ -51,7 +52,10 @@ class jenkinsModel extends model
*/ */
public function getPairs() public function getPairs()
{ {
$jenkins = $this->dao->select('id,name')->from(TABLE_JENKINS)->where('deleted')->eq('0')->orderBy('id')->fetchPairs('id', 'name'); $jenkins = $this->dao->select('id,name')->from(TABLE_JENKINS)
->where('deleted')->eq('0')
->andWhere('program')->eq($this->session->program)
->orderBy('id')->fetchPairs('id', 'name');
$jenkins = array('' => '') + $jenkins; $jenkins = array('' => '') + $jenkins;
return $jenkins; return $jenkins;
} }

1
module/job/model.php
View File

@@ -37,6 +37,7 @@ class jobModel extends model
->leftJoin(TABLE_REPO)->alias('t2')->on('t1.repo=t2.id') ->leftJoin(TABLE_REPO)->alias('t2')->on('t1.repo=t2.id')
->leftJoin(TABLE_JENKINS)->alias('t3')->on('t1.jkHost=t3.id') ->leftJoin(TABLE_JENKINS)->alias('t3')->on('t1.jkHost=t3.id')
->where('t1.deleted')->eq('0') ->where('t1.deleted')->eq('0')
->andWhere('t1.program')->eq($this->session->program)
->orderBy($orderBy) ->orderBy($orderBy)
->page($pager) ->page($pager)
->fetchAll('id'); ->fetchAll('id');

9
module/repo/model.php
View File

@@ -141,7 +141,9 @@ class repoModel extends model
*/ */
public function getList($orderBy = 'id_desc', $pager = null) public function getList($orderBy = 'id_desc', $pager = null)
{ {
$repos = $this->dao->select('*')->from(TABLE_REPO)->where('deleted')->eq('0') $repos = $this->dao->select('*')->from(TABLE_REPO)
->where('deleted')->eq('0')
->andWhere('program')->eq($this->session->program)
->orderBy($orderBy) ->orderBy($orderBy)
->page($pager) ->page($pager)
->fetchAll('id'); ->fetchAll('id');
@@ -271,7 +273,10 @@ class repoModel extends model
*/ */
public function getRepoPairs() public function getRepoPairs()
{ {
$repos = $this->dao->select('*')->from(TABLE_REPO)->where('deleted')->eq(0)->fetchAll(); $repos = $this->dao->select('*')->from(TABLE_REPO)
->where('deleted')->eq(0)
->andWhere('program')->eq($this->session->program)
->fetchAll();
$repoPairs = array(); $repoPairs = array();
foreach($repos as $repo) foreach($repos as $repo)
{ {