ActionBar: by_description gefixt

[kivitendo-erp.git] / SL / Layout / ActionBar / Action.pm

diff --git a/SL/Layout/ActionBar/Action.pm b/SL/Layout/ActionBar/Action.pm
index 8ac1d2d63fa1d4508aa394935ed313273d8a3750..8b83295c5467bb10a35a878c9a5261b4076889cb 100644 (file)
--- a/SL/Layout/ActionBar/Action.pm
+++ b/SL/Layout/ActionBar/Action.pm
@@ -24,10 +24,12 @@ sub script {
 sub from_descriptor {
   my ($class, $descriptor) = @_;
   require SL::Layout::ActionBar::Separator;
+  require SL::Layout::ActionBar::ComboBox;
 
-  {
+  return {
      separator => SL::Layout::ActionBar::Separator->new,
-  } or die 'unknown descriptor';
+     combobox  => SL::Layout::ActionBar::ComboBox->new,
+  }->{$descriptor} or die 'unknown descriptor';
 }
 
 # TODO: this necessary?
@@ -46,8 +48,9 @@ sub simple {
     return SL::Layout::ActionBar::ScriptButton->new(text => $text, params => \%params);
   }
 
-  if ($params{combobox}) {
-
+  if ($params{actions}) {
+    require SL::Layout::ActionBar::ComboBox;
+    return SL::Layout::ActionBar::ComboBox->new(text => $text, %params);
   }
 }