X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLayout%2FTop.pm;h=05c0046e1d5b9a4c6fbcc08dbf5e1ceddfe3b078;hb=163e000563f99042490a32a31996442dba64890b;hp=47ab065fbebd77a4829064d3e23ae6af6f33c120;hpb=46c987b8b139347af65a470ed377ed6cccca545c;p=kivitendo-erp.git

diff --git a/SL/Layout/Top.pm b/SL/Layout/Top.pm
index 47ab065fb..05c0046e1 100644
--- a/SL/Layout/Top.pm
+++ b/SL/Layout/Top.pm
@@ -3,13 +3,22 @@ package SL::Layout::Top;
 use strict;
 use parent qw(SL::Layout::Base);
 
+use SL::Controller::TopQuickSearch;
+
 sub pre_content {
   my ($self) = @_;
 
+  my @options;
+  # Only enable the quick search functionality if all database
+  # upgrades have already been applied as quick search requires
+  # certain columns that are only created by said database upgrades.
+  push @options, (quick_search => SL::Controller::TopQuickSearch->new) unless $::request->applying_database_upgrades;
+
   $self->presenter->render('menu/header',
     now        => DateTime->now_local,
-    is_fastcgi => $::dispatcher ? scalar($::dispatcher->interface_type =~ /fastcgi/i) : (),
+    is_fastcgi => $::dispatcher ? scalar($::dispatcher->interface_type =~ /fastcgi/i) : 0,
     is_links   => scalar($ENV{HTTP_USER_AGENT}         =~ /links/i),
+    @options,
   );
 }
 
@@ -18,8 +27,8 @@ sub stylesheets {
 }
 
 sub javascripts {
-  ('jquery-ui.js', 'quicksearch_input.js') x!! $::auth->assert('customer_vendor_edit', 1),
-  ('jquery-ui.js', 'glquicksearch.js')     x!! $::auth->assert('general_ledger', 1)
+  'jquery-ui.js',
+  'kivi.QuickSearch.js',
 }
 
 1;