X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLayout%2FActionBar%2FAction.pm;h=4243b652ba7e79c8e5b789396258ca7b5cdb4b4c;hb=4a03aa4d5f2c201e2524bbf54ff59c9896ad416a;hp=1ee9a3e9547ce1e23a9b3413fc7e85916a28d10b;hpb=2cac4306081513c991f7a84ed7c72c7d852ff019;p=kivitendo-erp.git

diff --git a/SL/Layout/ActionBar/Action.pm b/SL/Layout/ActionBar/Action.pm
index 1ee9a3e95..4243b652b 100644
--- a/SL/Layout/ActionBar/Action.pm
+++ b/SL/Layout/ActionBar/Action.pm
@@ -4,7 +4,6 @@ use strict;
 use parent qw(Rose::Object);
 
 use SL::Presenter;
-    require SL::Layout::ActionBar::Submit;
 
 use Rose::Object::MakeMethods::Generic (
   'scalar --get_set_init' => [ qw(id params text) ],
@@ -20,27 +19,20 @@ sub script {
   sprintf q|$('#%s').data('action', %s);|, $_[0]->id, JSON->new->allow_blessed->convert_blessed->encode($_[0]->params);
 }
 
-# static constructors
-
-sub from_descriptor {
-  my ($class, $descriptor) = @_;
-  require SL::Layout::ActionBar::Separator;
-  require SL::Layout::ActionBar::ComboBox;
-
-  return {
-     separator => SL::Layout::ActionBar::Separator->new,
-     combobox  => SL::Layout::ActionBar::ComboBox->new,
-  }->{$descriptor} || do { die 'unknown descriptor' };
-}
-
 # this is mostly so that outside consumer don't need to load subclasses themselves
-sub simple {
+sub from_params {
   my ($class, $data) = @_;
 
+  require SL::Layout::ActionBar::Submit;
+
   my ($text, %params) = @$data;
+  return if exists($params{only_if}) && !$params{only_if};
+  return if exists($params{not_if})  &&  $params{not_if};
   return SL::Layout::ActionBar::Submit->new(text => $text, params => \%params);
 }
 
+sub callable { 0 }
+
 # shortcut for presenter
 
 sub p {
@@ -78,9 +70,8 @@ on click submit the form specified by form-selector with the additional params
 
 on click call the specified function (is this a special case of checks?)
 
-- disabled => true/false (done)
+- disabled => true/false/tooltip explaning why disabled (done)
 
 TODO:
 
 - runtime disable/enable
-