X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLayout%2FTop.pm;h=471d6128dc01303baa7869a890a32336a954f180;hb=53593baa211863fbf66540cf1bcc36c8fb37257f;hp=075e2f2673815255d068f3fc98e1566e159e170f;hpb=4486e3bc8eb00c37cf8029e663eb94b4b9c5346a;p=kivitendo-erp.git

diff --git a/SL/Layout/Top.pm b/SL/Layout/Top.pm
index 075e2f267..471d6128d 100644
--- a/SL/Layout/Top.pm
+++ b/SL/Layout/Top.pm
@@ -3,19 +3,34 @@ package SL::Layout::Top;
 use strict;
 use parent qw(SL::Layout::Base);
 
+use SL::Controller::TopQuickSearch;
+
 sub pre_content {
   my ($self) = @_;
 
-  $self->SUPER::render('menu/header', { partial => 1, no_output => 1 },
-                now        => DateTime->now_local,
-                is_fastcgi => scalar($::dispatcher->interface_type =~ /fastcgi/i),
-                is_links   => scalar($ENV{HTTP_USER_AGENT}         =~ /links/i));
+  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) : 0,
+    is_links   => scalar($ENV{HTTP_USER_AGENT}         =~ /links/i),
+    @options,
+  );
 }
 
-sub stylesheets {
+sub static_stylesheets {
  'frame_header/header.css';
 }
 
+sub static_javascripts {
+  'jquery-ui.js',
+  'kivi.QuickSearch.js',
+}
+
 1;
 
 __END__