X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FTopQuickSearch.pm;h=4d0aa9492bec0302260a6db9d30d8e62e7f67e02;hb=a27846ef2756ed0f59c29d256a5d43d6caaf0b58;hp=f44ff6f49bd5bce819b83de43a8e1df50115873e;hpb=497da0ff32257cd249c8c60991f8aaebd92f409c;p=kivitendo-erp.git diff --git a/SL/Controller/TopQuickSearch.pm b/SL/Controller/TopQuickSearch.pm index f44ff6f49..4d0aa9492 100644 --- a/SL/Controller/TopQuickSearch.pm +++ b/SL/Controller/TopQuickSearch.pm @@ -21,11 +21,14 @@ my @available_modules = ( 'SL::Controller::TopQuickSearch::Contact', 'SL::Controller::TopQuickSearch::SalesQuotation', 'SL::Controller::TopQuickSearch::SalesOrder', + 'SL::Controller::TopQuickSearch::SalesDeliveryOrder', 'SL::Controller::TopQuickSearch::RequestForQuotation', 'SL::Controller::TopQuickSearch::PurchaseOrder', + 'SL::Controller::TopQuickSearch::PurchaseDeliveryOrder', 'SL::Controller::TopQuickSearch::GLTransaction', 'SL::Controller::TopQuickSearch::Customer', 'SL::Controller::TopQuickSearch::Vendor', + 'SL::Controller::TopQuickSearch::PhoneNumber', ); my %modules_by_name; @@ -70,19 +73,15 @@ sub enabled_modules { namespace => 'TopQuickSearch', ); - my %enabled_names; + my @quick_search_modules; if (my $prefs_val = $user_prefs->get('quick_search_modules')) { - my @quick_search_modules = split ',', $prefs_val; - - %enabled_names = map { - $_ => 1 - } @quick_search_modules ; + @quick_search_modules = split ',', $prefs_val; } else { - %enabled_names = map { - $_ => 1 - } @{ $::instance_conf->get_quick_search_modules }; + @quick_search_modules = @{ $::instance_conf->get_quick_search_modules }; } + my %enabled_names = map { $_ => 1 } @quick_search_modules; + grep { $enabled_names{$_->name} } $_[0]->available_modules @@ -90,7 +89,7 @@ sub enabled_modules { sub active_modules { grep { - $::auth->assert($_->auth, 1) + !$_->auth || $::auth->assert($_->auth, 1) } $_[0]->enabled_modules } @@ -103,7 +102,7 @@ sub init_module { die 'Unknown module ' . $::form->{module} unless my $class = $modules_by_name{$::form->{module}}; - $::auth->assert($class->auth); + $::auth->assert($class->auth) if $class->auth; return $class->new; }