X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FTopQuickSearch.pm;h=03d6504438a8534d761d835a603b460de8e5021a;hb=f5341298db5dbe7e14d0f97525f4f6226e5940c0;hp=8b470803142dc4482c4d7478850c6730081110a0;hpb=2fe6237c8b09d2f5a83145673c15be84bdfadf8a;p=kivitendo-erp.git diff --git a/SL/Controller/TopQuickSearch.pm b/SL/Controller/TopQuickSearch.pm index 8b4708031..03d650443 100644 --- a/SL/Controller/TopQuickSearch.pm +++ b/SL/Controller/TopQuickSearch.pm @@ -21,8 +21,10 @@ 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', @@ -70,20 +72,15 @@ sub enabled_modules { namespace => 'TopQuickSearch', ); - my %enabled_names; - if ($user_prefs) { - my $prefs_val = $user_prefs->get('quick_search_modules'); - my @quick_search_modules = split ',', $prefs_val; - - %enabled_names = map { - $_ => 1 - } @quick_search_modules ; + my @quick_search_modules; + if (my $prefs_val = $user_prefs->get('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 @@ -91,7 +88,7 @@ sub enabled_modules { sub active_modules { grep { - $::auth->assert($_->auth, 1) + !$_->auth || $::auth->assert($_->auth, 1) } $_[0]->enabled_modules } @@ -104,7 +101,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; }