Merge branch 'cyy_bug' into 'master'

* Modify job edit error tip.

See merge request easycorp/zentaopms!6689

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;}
 <?php if(common::checkNotCN()):?>
 .block-guide .tab-pane .mode-switch .mode-block:nth-child(1) {padding-bottom: 18px;}

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;
                 }
             }