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

* finish task #6960.

Browse Source
This commit is contained in:
wangyidong
2020-03-02 09:03:17 +08:00
parent 420a60ea8b
commit 579b17dec1
4 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/compile/control.php
+2 -1
View File
@@ -44,8 +44,9 @@ class compile extends control
$this->view->position[] = html::a($this->createLink('integration', 'browse'), $this->lang->ci->job);
$this->view->position[] = $this->lang->compile->browse;
$this->app->loadLang('integration');
$this->view->buildList = $this->compile->getList($jobID, $orderBy, $pager);
$this->view->job = $this->loadModel('integration')->getByID($jobID);
$this->view->jobID = $jobID;
$this->view->orderBy = $orderBy;
$this->view->pager = $pager;
$this->display();
module/compile/model.php
+2 -1
View File
@@ -27,7 +27,8 @@ class compileModel extends model
->leftJoin(TABLE_REPO)->alias('t3')->on('t2.repo=t3.id')
->leftJoin(TABLE_JENKINS)->alias('t4')->on('t2.jkHost=t4.id')
->where('t1.deleted')->eq('0')
->andWhere('t1.cijob')->eq($jobID)
->andWhere('t1.cijob')->ne('0')
->beginIF(!empty($jobID))->andWhere('t1.cijob')->eq($jobID)->fi()
->orderBy($orderBy)
->page($pager)
->fetchAll('id');
module/compile/view/browse.html.php
+15 -15
View File
@@ -24,30 +24,30 @@
<form class='main-table' id='ajaxForm' method='post'>
<table id='buildList' class='table has-sort-head table-fixed'>
<thead>
<tr>
<?php $vars = "jobID={$job->id}&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
<tr class='text-center'>
<?php $vars = "jobID={$jobID}&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
<th class='w-60px'><?php common::printOrderLink('id', $orderBy, $vars, $lang->compile->id);?></th>
<th class='w-200px text-left'><?php common::printOrderLink('name', $orderBy, $vars, $lang->compile->name);?></th>
<th class='w-200px text-left'><?php echo $lang->integration->repo;?></th>
<th class='text-left'><?php common::printOrderLink('name', $orderBy, $vars, $lang->compile->name);?></th>
<th class='text-left'><?php echo $lang->integration->repo;?></th>
<th class='w-200px text-left'><?php echo $lang->integration->jkHost;?></th>
<th class='w-200px text-left'><?php echo $lang->integration->triggerType;?></th>
<th class='w-150px text-left'><?php common::printOrderLink('status', $orderBy, $vars, $lang->compile->status);?></th>
<th class='text-left'><?php common::printOrderLink('createdDate', $orderBy, $vars, $lang->compile->time);?></th>
<th class='w-100px c-actions-4'><?php echo $lang->actions;?></th>
<th class='w-140px text-left'><?php echo $lang->integration->triggerType;?></th>
<th class='w-80px text-left'><?php common::printOrderLink('status', $orderBy, $vars, $lang->compile->status);?></th>
<th class='w-130px'><?php common::printOrderLink('createdDate', $orderBy, $vars, $lang->compile->time);?></th>
<th class='c-actions-1'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
<?php foreach ($buildList as $id => $build): ?>
<?php foreach($buildList as $id => $build):?>
<tr>
<td class='text-center'><?php echo $id; ?></td>
<td class='text' title='<?php echo $build->name; ?>'><?php echo $build->name; ?></td>
<td class='text' title='<?php echo $build->repoName; ?>'><?php echo $build->repoName; ?></td>
<td class='text' title='<?php echo $build->jenkinsName; ?>'><?php echo $build->jenkinsName; ?></td>
<td class='text-center'><?php echo $id;?></td>
<td class='text' title='<?php echo $build->name;?>'><?php echo $build->name;?></td>
<td class='text' title='<?php echo $build->repoName;?>'><?php echo $build->repoName;?></td>
<td class='text' title='<?php echo $build->jenkinsName;?>'><?php echo $build->jenkinsName;?></td>
<?php $triggerType = zget($lang->integration->triggerTypeList, $build->triggerType);?>
<td class='text' title='<?php echo $triggerType;?>'><?php echo $triggerType;?></td>
<?php $buildStatus = zget($lang->compile->statusList, $build->status);?>
<td class='text' title='<?php echo $buildStatus;?>'><?php echo $buildStatus;?></td>
<td class='text' title='<?php echo $build->createDate; ?>'><?php echo $build->createdDate; ?></td>
<td class='text' title='<?php echo $build->createdDate;?>'><?php echo $build->createdDate;?></td>
<td class='c-actions text-center'>
<?php common::printIcon('compile', 'logs', "buildID=$id", '', 'list', 'file-text', '', '', '', '', $lang->compile->logs);?>
</td>
@@ -60,4 +60,4 @@
<?php endif; ?>
</form>
</div>
<?php include '../../common/view/footer.html.php'; ?>
<?php include '../../common/view/footer.html.php';?>
module/integration/view/browse.html.php
+3 -2
View File
@@ -14,6 +14,7 @@
<div id="mainMenu" class="clearfix">
<div class="btn-toolbar pull-left">
<?php echo html::a($this->createLink('integration', 'browse'), "<span class='text'>{$lang->ci->task}</span>", '', "class='btn btn-link btn-active-text'");?>
<?php echo html::a($this->createLink('compile', 'browse'), "<span class='text'>{$lang->ci->history}</span>", '', "class='btn btn-link'");?>
</div>
<div class="btn-toolbar pull-right">
<?php if(common::hasPriv('integration', 'create')) common::printLink('integration', 'create', "", "<i class='icon icon-plus'></i> " . $lang->integration->create, '', "class='btn btn-primary'");?>
@@ -23,7 +24,7 @@
<form class='main-table' id='ajaxForm' method='post'>
<table id='jobList' class='table has-sort-head table-fixed'>
<thead>
<tr>
<tr class='text-center'>
<?php $vars = "orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
<th class='w-60px'><?php common::printOrderLink('id', $orderBy, $vars, $lang->integration->id);?></th>
<th class='w-200px text-left'><?php common::printOrderLink('name', $orderBy, $vars, $lang->integration->name);?></th>
@@ -32,7 +33,7 @@
<th class='w-200px text-left'><?php common::printOrderLink('jkHost', $orderBy, $vars, $lang->integration->jkHost);?></th>
<th class='w-200px text-left'><?php echo $lang->integration->jkJob;?></th>
<th class='text-left'><?php echo $lang->integration->lastExec;?></th>
<th class='w-120px c-actions-4'><?php echo $lang->actions;?></th>
<th class='w-120px c-actions-3'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>