Merge branch 'sprint/231_zg_bugs' into 'master'

* Fix sprint231 bugs

See merge request easycorp/zentaopms!5184
This commit is contained in:
王怡栋
2022-08-29 08:03:22 +00:00
4 changed files with 8 additions and 4 deletions
+2
View File
@@ -78,10 +78,12 @@ $(function()
hiddenRequireFields();
});
var maxAutoDropWidth = document.body.scrollWidth + (document.getElementById('resolutions1').offsetWidth / 2) - document.getElementById('resolutions1').getBoundingClientRect().right;
$('select[id^="duplicateBugs"]').picker(
{
disableEmptySearch : true,
dropWidth : 'auto',
maxAutoDropWidth : maxAutoDropWidth,
onReady: function(event)
{
$(event.picker.$container).addClass('required');
+2 -1
View File
@@ -23,7 +23,8 @@ $(function()
$('#duplicateBug').picker(
{
disableEmptySearch : true,
dropWidth : 'auto'
dropWidth : 'auto',
maxAutoDropWidth : document.body.scrollWidth + document.getElementById('resolution').offsetWidth - document.getElementById('resolution').getBoundingClientRect().right
});
});
+2 -2
View File
@@ -42,7 +42,7 @@ js::set('productID' , $bug->product);
</tr>
<tr>
<th><?php echo $lang->bug->resolvedBuild;?></th>
<td id='newBuildExecutionBox' class='hidden'>
<td id='newBuildExecutionBox' class='hidden required'>
<div class='input-group'>
<span class='input-group-addon'><?php echo (!empty($execution) and $execution->type == 'kanban') ? $lang->bug->kanban : $lang->build->execution;?></span>
<?php echo html::select('buildExecution', $executions, $bug->execution, "class='form-control chosen'");?>
@@ -50,7 +50,7 @@ js::set('productID' , $bug->product);
</td>
<td>
<div id='resolvedBuildBox'><?php echo html::select('resolvedBuild', $builds, '', "class='form-control chosen'");?></div>
<div id='newBuildBox' class='hidden'><?php echo html::input('buildName', '', "class='form-control' placeholder='{$lang->bug->placeholder->newBuildName}'");?></div>
<div id='newBuildBox' class='hidden required'><?php echo html::input('buildName', '', "class='form-control' placeholder='{$lang->bug->placeholder->newBuildName}'");?></div>
</td>
<td>
<?php if(common::hasPriv('build', 'create')):?>
+2 -1
View File
@@ -83,6 +83,7 @@ $(function()
$('#duplicateStory').picker(
{
disableEmptySearch : true,
dropWidth : 'auto'
dropWidth : 'auto',
maxAutoDropWidth : document.body.scrollWidth + document.getElementById('duplicateStory').offsetWidth - document.getElementById('duplicateStoryBox').getBoundingClientRect().right
});
})