From 6a4c26472da57dab5540b76a04014fc6e417ebd8 Mon Sep 17 00:00:00 2001 From: Jan Novotny Date: Fri, 21 Jun 2019 00:14:02 +0200 Subject: [PATCH] Fix GroupAction select not showing when action is chosen --- assets/dist/datagrid.css | 3 +++ assets/src/datagrid.scss | 3 +++ src/templates/datagrid.latte | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/assets/dist/datagrid.css b/assets/dist/datagrid.css index 637a7cce..6318245f 100755 --- a/assets/dist/datagrid.css +++ b/assets/dist/datagrid.css @@ -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; diff --git a/assets/src/datagrid.scss b/assets/src/datagrid.scss index f5ad2e86..ad14801a 100644 --- a/assets/src/datagrid.scss +++ b/assets/src/datagrid.scss @@ -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; diff --git a/src/templates/datagrid.latte b/src/templates/datagrid.latte index 13ccab29..3a95cca5 100644 --- a/src/templates/datagrid.latte +++ b/src/templates/datagrid.latte @@ -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()}