Skip to content

Commit

Permalink
Fix selects inside inline forms see BT#15465
Browse files Browse the repository at this point in the history
  • Loading branch information
jmontoyaa committed Mar 26, 2019
1 parent 90e13a9 commit c16538f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
12 changes: 4 additions & 8 deletions main/inc/lib/pear/HTML/QuickForm/select.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */

/**
* Class to dynamically create an HTML SELECT
Expand Down Expand Up @@ -607,16 +606,13 @@ public function getTemplate($layout)
switch ($layout) {
case FormValidator::LAYOUT_INLINE:
return '
<div class="input-group">
<div class="form-group {error_class}">
<label {label-for} >
<!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
{label}
</label>
</div>
<div class="input-group {error_class}">
{element}
</div>
';
</label>
{element}
</div>';
break;
case FormValidator::LAYOUT_HORIZONTAL:
return '
Expand Down
2 changes: 1 addition & 1 deletion main/tracking/courseLog.php
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ function(index) {
'since',
Display::returnFontAwesomeIcon('warning').get_lang('RemindInactivesLearnersSince'),
$options,
['class' => 'col-sm-3']
['disable_js' => true]
);
$el->setSelected(7);

Expand Down

0 comments on commit c16538f

Please sign in to comment.