From a3f39ecb95bb4e1e7ae7da27d26c4934f804c9c2 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Sat, 12 Oct 2024 13:39:51 +0800 Subject: [PATCH] + [task#129964,doing,0.5h] add default value for job triger page. --- module/job/js/trigger.ui.js | 7 ++++--- module/job/ui/trigger.html.php | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/module/job/js/trigger.ui.js b/module/job/js/trigger.ui.js index ab768da947..6723d8af9d 100644 --- a/module/job/js/trigger.ui.js +++ b/module/job/js/trigger.ui.js @@ -86,7 +86,7 @@ window.changeTriggerType = function(event) } if(type != 'tag' || repo.SCM == 'Subversion') $parentDom.append(eval(`${type}Field`).replace(/%s/g, window.triggerCount)); - if(type != 'commit') eval(`window.${type}BlockInit()`); + if(window[`${type}BlockInit`]) eval(`window.${type}BlockInit()`); $parentDom.find('.hidden').removeClass('hidden'); } @@ -155,7 +155,7 @@ window.tagBlockInit = function() items: options, name: `svnDir[]`, required: true, - defaultValue: options.length ? options[0].value : '' + defaultValue: job.svnDir }); } @@ -163,6 +163,7 @@ window.scheduleBlockInit = function() { $('#scheduleTime' + window.triggerCount).addClass('form-group-wrapper picker-box'); new zui.TimePicker('#scheduleTime' + window.triggerCount, { - name: 'atTime' + name: 'atTime', + defaultValue: job.atTime }) } diff --git a/module/job/ui/trigger.html.php b/module/job/ui/trigger.html.php index d33b912182..14f4179503 100644 --- a/module/job/ui/trigger.html.php +++ b/module/job/ui/trigger.html.php @@ -9,6 +9,7 @@ declare(strict_types=1); * @link https://www.zentao.net */ namespace zin; +jsVar('job', $job); jsVar('repo', $repo); jsVar('dirs', !empty($dirs) ? $dirs : ''); jsVar('triggerRepeat', $lang->job->triggerRepeat); @@ -53,7 +54,8 @@ jsVar('scheduleField', div set::label(''), set::name('atDay[]'), set::control('checkListInline'), - set::items($lang->datepicker->dayNames) + set::items($lang->datepicker->dayNames), + set::value($job->atDay) ) ), formRow