From a29dc70a21af073c4140eeb05ce65f5c6f1198aa Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Thu, 5 Jan 2023 08:44:04 +0800 Subject: [PATCH 1/2] * Modify job edit error tip. --- module/job/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/job/model.php b/module/job/model.php index 7bae1cf900..e8a0c8b4b4 100644 --- a/module/job/model.php +++ b/module/job/model.php @@ -312,7 +312,7 @@ class jobModel extends model $pipeline = $this->loadModel('gitlab')->apiGetPipeline($repo->serviceHost, $repo->serviceProject, $this->post->reference); if(!is_array($pipeline) or empty($pipeline)) { - dao::$errors['repo'] = $this->lang->job->engineTips->error; + dao::$errors['gitlabRepo'] = $this->lang->job->engineTips->error; return false; } } From 459f1ae27d145fadf206e5414d0238fa506304e7 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Thu, 5 Jan 2023 09:58:49 +0800 Subject: [PATCH 2/2] * Fix bug #31469. --- module/block/view/systemmodeswitch.html.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/block/view/systemmodeswitch.html.php b/module/block/view/systemmodeswitch.html.php index 62db595198..7b42fac74a 100644 --- a/module/block/view/systemmodeswitch.html.php +++ b/module/block/view/systemmodeswitch.html.php @@ -11,6 +11,7 @@ #selectProgramModal .modal-header {border-bottom: 0;} #selectProgramModal .modal-header h4.modal-title {font-weight: 700;} #selectProgramModal .modal-dialog {width: 550px;} +.modal-body {padding: 20px;} #selectProgramModal .modal-footer {border-top: 0px; text-align: center;} .block-guide .tab-pane .mode-switch .mode-block:nth-child(1) {padding-bottom: 18px;}