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

+ Add commit update tips for mr view.

Browse Source
This commit is contained in:
caoyanyi
2024-05-20 15:31:22 +08:00
parent 064459975b
commit 422478e03f
3 changed files with 61 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/ui/view.html.php
+18 -9
View File
@@ -38,14 +38,14 @@ if($MR->compileID)
set::name($lang->compile->atTime),
$compile->createdDate
),
($compileJob && !empty($compileJob->id)) ? item
!empty($MR->jobID) ? item
(
set::name($lang->compile->result),
zget($lang->compile->statusList, $compile->status),
in_array($compile->status, array('success', 'failure')) ? h::a
(
setClass('ml-1'),
set::href($this->createLink('job', 'view', "jobID={$compileJob->id}&compileID={$compile->id}")),
set::href($this->createLink('job', 'view', "jobID={$MR->jobID}&compileID={$compile->id}")),
set('data-toggle', 'modal'),
icon('search'),
$lang->compile->logs
@@ -274,15 +274,24 @@ panel
set::align('baseline'),
div
(
setClass('text-lg font-bold'),
setClass('text-lg font-bold flex justify-between'),
$lang->mr->jobID,
!empty($compileJob->id) && hasPriv('job', 'exec') ? btn
div
(
setClass('btn ghost text-primary size-sm pull-right ajax-submit'),
set::url(helper::createLink('mr', 'ajaxExecJob', "MRID={$MR->id}&jobID={$compileJob->id}")),
set::hint($lang->mr->execJobTip),
$lang->mr->execJob
) : null
setClass('text-base font-thin'),
$hasNewCommit ? span
(
setClass('mr-2'),
$lang->mr->branchUpdateTip
) : null,
!empty($MR->jobID) && hasPriv('job', 'exec') ? btn
(
setClass('label primary size-sm ajax-submit'),
set::url(helper::createLink('mr', 'ajaxExecJob', "MRID={$MR->id}&jobID={$MR->jobID}")),
set::hint($lang->mr->execJobTip),
$lang->mr->execJob
) : null
)
),
$job
)