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

Merge branch 'liyuchun_fixbug_26301' into 'zenops_41'

Browse Source 
* Fix bug #26301.

See merge request easycorp/zentaopms!4966
This commit is contained in:
孙广明
2022-08-15 07:02:26 +00:00
parent eda8dd7b71 6ffac378bf
commit 5391d4a163
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/job/css/create.css
+1 -1
View File
@@ -5,6 +5,6 @@
#server_chosen .chosen-single {border-right: 0px;}
#pipelineBox {width: 385px;}
#svnDirBox .input-group {width: unset !important;}
#paramDiv .input-group {padding: 3px;}
#jenkinsServerTR .input-group-addon {border-left-width: 0 !important;}
.chosen-container .chosen-drop{z-index: 1100;} /* from c20b7e7a5 */
module/job/css/edit.css
+1 -1
View File
@@ -5,4 +5,4 @@
#server_chosen .chosen-single {border-right: 0px;}
#pipelineBox {width: 385px;}
#svnDirBox .input-group {width: unset !important;}
#paramDiv .input-group {padding: 3px;}
#jenkinsServerTR .input-group-addon {border-left-width: 0 !important;}
module/job/view/create.html.php
+3 -3
View File
@@ -62,7 +62,7 @@
</tr>
<tr>
<th><?php echo $lang->job->triggerType; ?></th>
<td><?php echo html::select('triggerType', $lang->job->triggerTypeList, '', "class='form-control'");?></td>
<td><?php echo html::select('triggerType', $lang->job->triggerTypeList, '', "class='form-control chosen'");?></td>
<td colspan="2"></td>
</tr>
<tr id='svnDirBox' class='svn-fields'>
@@ -122,9 +122,9 @@
<th><?php echo $lang->job->customParam;?></th>
<td colspan='2' id='paramDiv'>
<div class='table-row input-group'>
<span class='input-group-addon w-50px'><?php echo $lang->job->paramName; ?></span>
<span class='input-group-addon <?php echo common::checkNotCN() ? 'w-60px' : 'w-50px'?>'><?php echo $lang->job->paramName; ?></span>
<?php echo html::input('paramName[]', '', "class='form-control'"); ?>
<span class='input-group-addon w-40px'><?php echo $lang->job->paramValue; ?></span>
<span class='input-group-addon <?php echo common::checkNotCN() ? 'w-60px' : 'w-40px'?>'><?php echo $lang->job->paramValue; ?></span>
<?php echo html::select('paramValue[]', $lang->job->paramValueList, '', "class='form-control' onchange='setParamName(this)'"); ?>
<?php echo html::input('paramValue[]', '', "class='form-control hidden' id='paramValue' disabled"); ?>
<span class='input-group-addon w-90px'>
module/job/view/edit.html.php
+3 -3
View File
@@ -63,7 +63,7 @@
<tr>
<th><?php echo $lang->job->triggerType;?></th>
<?php if($repoType == 'Subversion') $lang->job->triggerTypeList['tag'] = $lang->job->dirChange;?>
<td><?php echo html::select('triggerType', $lang->job->triggerTypeList, $job->triggerType, "class='form-control'");?></td>
<td><?php echo html::select('triggerType', $lang->job->triggerTypeList, $job->triggerType, "class='form-control chosen'");?></td>
<td colspan="2"></td>
</tr>
<tr id='svnDirBox' class='svn-fields'>
@@ -170,9 +170,9 @@
<?php endforeach;?>
<?php endif;?>
<div class='table-row input-group'>
<span class='input-group-addon w-50px'><?php echo $lang->job->paramName;?></span>
<span class='input-group-addon <?php echo common::checkNotCN() ? 'w-60px' : 'w-50px'?>'><?php echo $lang->job->paramName; ?></span>
<?php echo html::input('paramName[]', '', "class='form-control' id='paramName'");?>
<span class='input-group-addon w-40px'><?php echo $lang->job->paramValue;?></span>
<span class='input-group-addon <?php echo common::checkNotCN() ? 'w-60px' : 'w-40px'?>'><?php echo $lang->job->paramValue; ?></span>
<?php echo html::select('paramValue[]', $lang->job->paramValueList, '', "class='form-control' onchange='setParamName(this)'");?>
<?php echo html::input('paramValue[]', '', "class='form-control hidden' id='paramValue' disabled");?>
<span class='input-group-addon w-90px'>