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

* Finish task #97204.

Browse Source
This commit is contained in:
zhaoke
2023-07-11 18:45:23 +08:00
parent 70a99f760d
commit 666a235d32
5 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/compile/ui/logs.html.php
+1 -1
View File
@@ -13,7 +13,7 @@ global $lang;
detailHeader(
to::prefix(''),
to::title($lang->compile->logs),
to::title(span(setClass('font-semibold'), $lang->compile->logs)),
to::suffix
(
div
module/job/config/dtable.php
+25 -25
View File
@@ -15,62 +15,62 @@ $config->job->dtable->fieldList['id']['checkbox'] = false;
$config->job->dtable->fieldList['name']['title'] = $lang->job->name;
$config->job->dtable->fieldList['name']['name'] = 'name';
$config->job->dtable->fieldList['name']['fixed'] = 'left';
$config->job->dtable->fieldList['name']['type'] = 'shortTitle';
$config->job->dtable->fieldList['name']['type'] = 'desc';
$config->job->dtable->fieldList['name']['sortType'] = true;
$config->job->dtable->fieldList['name']['minWidth'] = '150';
$config->job->dtable->fieldList['name']['hint'] = true;
$config->job->dtable->fieldList['name']['checkbox'] = false;
$config->job->dtable->fieldList['name']['link'] = array('module' => 'job', 'method' => 'view', 'params' => 'jobID={id}');
$config->job->dtable->fieldList['name']['data-toggle'] = 'modal';
$config->job->dtable->fieldList['lastStatus']['title'] = $lang->job->lastStatus;
$config->job->dtable->fieldList['lastStatus']['name'] = 'lastStatus';
$config->job->dtable->fieldList['lastStatus']['sortType'] = true;
$config->job->dtable->fieldList['lastStatus']['width'] = '110';
$config->job->dtable->fieldList['lastStatus']['hint'] = true;
$config->job->dtable->fieldList['buildSpec']['title'] = $lang->job->buildSpec;
$config->job->dtable->fieldList['buildSpec']['name'] = 'buildSpec';
$config->job->dtable->fieldList['buildSpec']['type'] = 'text';
$config->job->dtable->fieldList['buildSpec']['sortType'] = false;
$config->job->dtable->fieldList['product']['minWidth'] = '120';
$config->job->dtable->fieldList['buildSpec']['hint'] = true;
$config->job->dtable->fieldList['product']['title'] = $lang->job->product;
$config->job->dtable->fieldList['product']['name'] = 'productName';
$config->job->dtable->fieldList['product']['type'] = 'text';
$config->job->dtable->fieldList['product']['sortType'] = false;
$config->job->dtable->fieldList['product']['minWidth'] = '120';
$config->job->dtable->fieldList['product']['hint'] = true;
$config->job->dtable->fieldList['repo']['title'] = $lang->job->repo;
$config->job->dtable->fieldList['repo']['name'] = 'repoName';
$config->job->dtable->fieldList['repo']['type'] = 'text';
$config->job->dtable->fieldList['repo']['sortType'] = true;
$config->job->dtable->fieldList['repo']['checkbox'] = false;
$config->job->dtable->fieldList['repo']['fixed'] = false;
$config->job->dtable->fieldList['repo']['width'] = '100';
$config->job->dtable->fieldList['repo']['hint'] = true;
$config->job->dtable->fieldList['engine']['title'] = $lang->job->engine;
$config->job->dtable->fieldList['engine']['name'] = 'engine';
$config->job->dtable->fieldList['engine']['type'] = 'text';
$config->job->dtable->fieldList['engine']['sortType'] = true;
$config->job->dtable->fieldList['engine']['width'] = '80';
$config->job->dtable->fieldList['engine']['hint'] = true;
$config->job->dtable->fieldList['frame']['title'] = $lang->job->frame;
$config->job->dtable->fieldList['frame']['name'] = 'frame';
$config->job->dtable->fieldList['frame']['type'] = 'text';
$config->job->dtable->fieldList['frame']['sortType'] = true;
$config->job->dtable->fieldList['frame']['show'] = true;
$config->job->dtable->fieldList['frame']['width'] = '100';
$config->job->dtable->fieldList['frame']['hint'] = true;
$config->job->dtable->fieldList['buildSpec']['title'] = $lang->job->buildSpec;
$config->job->dtable->fieldList['buildSpec']['name'] = 'buildSpec';
$config->job->dtable->fieldList['buildSpec']['type'] = 'text';
$config->job->dtable->fieldList['buildSpec']['sortType'] = false;
$config->job->dtable->fieldList['buildSpec']['width'] = '80';
$config->job->dtable->fieldList['buildSpec']['hint'] = true;
$config->job->dtable->fieldList['triggerType']['title'] = $lang->job->triggerType;
$config->job->dtable->fieldList['triggerType']['name'] = 'triggerType';
$config->job->dtable->fieldList['triggerType']['type'] = 'text';
$config->job->dtable->fieldList['triggerType']['sortType'] = false;
$config->job->dtable->fieldList['triggerType']['width'] = '80';
$config->job->dtable->fieldList['triggerType']['width'] = '100';
$config->job->dtable->fieldList['triggerType']['hint'] = true;
$config->job->dtable->fieldList['lastStatus']['title'] = $lang->job->lastStatus;
$config->job->dtable->fieldList['lastStatus']['name'] = 'lastStatus';
$config->job->dtable->fieldList['lastStatus']['type'] = 'status';
$config->job->dtable->fieldList['lastStatus']['sortType'] = true;
$config->job->dtable->fieldList['lastStatus']['width'] = '110';
$config->job->dtable->fieldList['lastStatus']['hint'] = true;
$config->job->dtable->fieldList['lastExec']['title'] = $lang->job->lastExec;
$config->job->dtable->fieldList['lastExec']['name'] = 'lastExec';
$config->job->dtable->fieldList['lastExec']['type'] = 'date';
$config->job->dtable->fieldList['lastExec']['type'] = 'datetime';
$config->job->dtable->fieldList['lastExec']['sortType'] = true;
$config->job->dtable->fieldList['lastExec']['width'] = '120';
$config->job->dtable->fieldList['lastExec']['hint'] = true;
$config->job->actionList = array();
module/job/control.php
+3
View File
@@ -48,6 +48,8 @@ class job extends control
$this->app->loadClass('pager', true);
$pager = new pager($recTotal, $recPerPage, $pageID);
$products = $this->loadModel('product')->getPairs();
$this->app->loadLang('compile');
$jobList = $this->job->getList($repoID, $orderBy, $pager);
$this->loadModel('gitlab');
@@ -75,6 +77,7 @@ class job extends control
$job->buildSpec = urldecode($job->pipeline) . '@' . $job->jenkinsName;
$job->engine = zget($this->lang->job->engineList, $job->engine);
$job->frame = zget($this->lang->job->frameList, $job->frame);
$job->productName = $products[$job->product];
}
$this->view->title = $this->lang->ci->job . $this->lang->colon . $this->lang->job->browse;
module/job/lang/zh-cn.php
+3 -3
View File
@@ -15,8 +15,8 @@ $lang->job->execSuccess = '执行成功';
$lang->job->browseAction = '流水线列表';
$lang->job->id = 'ID';
$lang->job->name = '名称';
$lang->job->repo = '代码库';
$lang->job->name = '流水线名称';
$lang->job->repo = '关联代码库';
$lang->job->product = '关联' . $lang->productCommon;
$lang->job->svnDir = 'SVN监控路径';
$lang->job->jenkins = 'Jenkins';
@@ -103,4 +103,4 @@ $lang->job->pipelineVariablesTips = "指定要在此次运行中使
$lang->job->setReferenceTips = "在执行构建前，请先设置代码库的分支信息。";
$lang->job->featureBar['browse']['job'] = '列表';
$lang->job->featureBar['browse']['compile'] = '构建历史';
$lang->job->featureBar['browse']['compile'] = '执行历史';
module/repo/control.php
+3 -3
View File
@@ -1052,7 +1052,7 @@ class repo extends control
* @access public
* @return void
*/
public function linkStory($repoID, $revision, $browseType = '', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 100, $pageID = 1)
public function linkStory($repoID, $revision, $browseType = '', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 10, $pageID = 1)
{
if(!empty($_POST['stories']))
{
@@ -1139,7 +1139,7 @@ class repo extends control
* @access public
* @return void
*/
public function linkBug($repoID, $revision = '', $browseType = '', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 100, $pageID = 1)
public function linkBug($repoID, $revision = '', $browseType = '', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 10, $pageID = 1)
{
if(!empty($_POST['bugs']))
{
@@ -1226,7 +1226,7 @@ class repo extends control
* @access public
* @return void
*/
public function linkTask($repoID, $revision = '', $browseType = 'unclosed', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 100, $pageID = 1)
public function linkTask($repoID, $revision = '', $browseType = 'unclosed', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 10, $pageID = 1)
{
if(!empty($_POST['tasks']))
{