Skip to content

Commit

Permalink
Fix GroupAction select not showing when action is chosen
Browse files Browse the repository at this point in the history
  • Loading branch information
novotnej authored and paveljanda committed Apr 20, 2020
1 parent e42547a commit 6a4c264
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
3 changes: 3 additions & 0 deletions assets/dist/datagrid.css
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,9 @@
display: inline-block;
margin-bottom: 0;
vertical-align: middle; }
.datagrid .ublaboo-datagrid-th-form-inline .form-control[hidden] {
display:none;
}
.datagrid .ublaboo-datagrid-th-form-inline .form-control {
display: inline-block;
width: auto;
Expand Down
3 changes: 3 additions & 0 deletions assets/src/datagrid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -629,6 +629,9 @@
margin-bottom: 0;
vertical-align: middle;
}
.ublaboo-datagrid-th-form-inline .form-control[hidden] {
display: none;
}
.ublaboo-datagrid-th-form-inline .form-control {
display: inline-block;
width: auto;
Expand Down
4 changes: 2 additions & 2 deletions src/templates/datagrid.latte
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,11 @@
{='ublaboo_datagrid.group_actions'|translate}:
{foreach $filter['group_action']->getControls() as $form_control}
{if $form_control instanceof \Nette\Forms\Controls\SubmitButton}
{input $form_control, class => 'btn btn-primary btn-sm', style => 'display:none'}
{input $form_control, class => 'btn btn-primary btn-sm'}
{elseif $form_control->getName() == 'group_action'}
{input $form_control, class => 'form-control input-sm form-control-sm', disabled => TRUE}
{else}
{input $form_control, style => 'display:none'}
{input $form_control}
{/if}
{/foreach}
{if $control->shouldShowSelectedRowsCount()}
Expand Down

0 comments on commit 6a4c264

Please sign in to comment.