X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLayout%2FActionBar%2FComboBox.pm;h=477151dbc9e1929b939bd90754cf1391f7fa2295;hb=3782a90c336bc6c506f572e607c8526cb5e79ea3;hp=555ae69b2f0810d6f8600e826e4d1c4caad06c3d;hpb=3cc1ebb7995720386bb845c266efa807e931df86;p=kivitendo-erp.git diff --git a/SL/Layout/ActionBar/ComboBox.pm b/SL/Layout/ActionBar/ComboBox.pm index 555ae69b2..477151dbc 100644 --- a/SL/Layout/ActionBar/ComboBox.pm +++ b/SL/Layout/ActionBar/ComboBox.pm @@ -4,6 +4,8 @@ use strict; use parent qw(SL::Layout::ActionBar::Action); use JSON; +use List::MoreUtils qw(none); +use SL::Presenter::Tag qw(html_tag); use Rose::Object::MakeMethods::Generic ( 'scalar --get_set_init' => [ qw(actions) ], @@ -21,11 +23,12 @@ sub from_params { sub render { my ($first, @rest) = @{ $_[0]->actions }; + return if none { $_->callable } @{ $_[0]->actions }; return $first->render if !@rest; - $_[0]->p->html_tag('div', - $_[0]->p->html_tag('div', $first->render . $_[0]->p->html_tag('span'), class => 'layout-actionbar-combobox-head') . - $_[0]->p->html_tag('div', join('', map { $_->render } @rest), class => 'layout-actionbar-combobox-list'), + html_tag('div', + html_tag('div', $first->render . html_tag('span'), class => 'layout-actionbar-combobox-head') . + html_tag('div', join('', map { $_->render } @rest), class => 'layout-actionbar-combobox-list'), id => $_[0]->id, class => 'layout-actionbar-combobox', );