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

* move integration to job.

Browse Source
This commit is contained in:
wangyidong
2020-03-06 17:35:33 +08:00
parent ae0e2344d2
commit 31aba45ddc
30 changed files with 400 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/compile/control.php
+10 -10
View File
@@ -28,7 +28,7 @@ class compile extends control
/**
* Browse jenkins build.
*
* @param int $integrationID
* @param int $jobID
* @param string $orderBy
* @param int $recTotal
* @param int $recPerPage
@@ -36,18 +36,18 @@ class compile extends control
* @access public
* @return void
*/
public function browse($integrationID = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
public function browse($jobID = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
$this->app->loadClass('pager', $static = true);
$pager = new pager($recTotal, $recPerPage, $pageID);
$this->view->title = $this->lang->ci->integration . $this->lang->colon . $this->lang->compile->browse;
$this->view->position[] = html::a($this->createLink('integration', 'browse'), $this->lang->ci->integration);
$this->view->title = $this->lang->ci->job . $this->lang->colon . $this->lang->compile->browse;
$this->view->position[] = html::a($this->createLink('job', 'browse'), $this->lang->ci->job);
$this->view->position[] = $this->lang->compile->browse;
$this->app->loadLang('integration');
$this->view->integrationID = $integrationID;
$this->view->buildList = $this->compile->getList($integrationID, $orderBy, $pager);
$this->app->loadLang('job');
$this->view->jobID = $jobID;
$this->view->buildList = $this->compile->getList($jobID, $orderBy, $pager);
$this->view->orderBy = $orderBy;
$this->view->pager = $pager;
$this->display();
@@ -66,9 +66,9 @@ class compile extends control
$this->view->logs = str_replace("\r\n","<br />", $build->logs);
$this->view->build = $build;
$this->view->title = $this->lang->ci->integration . $this->lang->colon . $this->lang->compile->logs;
$this->view->position[] = html::a($this->createLink('integration', 'browse'), $this->lang->ci->integration);
$this->view->position[] = html::a($this->createLink('compile', 'browse', "integrationID=" . $build->integration), $this->lang->compile->browse);
$this->view->title = $this->lang->ci->job . $this->lang->colon . $this->lang->compile->logs;
$this->view->position[] = html::a($this->createLink('job', 'browse'), $this->lang->ci->job);
$this->view->position[] = html::a($this->createLink('compile', 'browse', "jobID=" . $build->job), $this->lang->compile->browse);
$this->view->position[] = $this->lang->compile->logs;
$this->display();
}