From d281eedf12fcb699ebddbaa8395d6f15a06cff1f Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Fri, 11 Nov 2016 12:35:30 +0100
Subject: [PATCH] ActionBar: Verwendung in Berichtsfunktion in oe.pl

---
 bin/mozilla/oe.pl                 | 18 +++++++++++++++++-
 templates/webpages/oe/search.html |  6 ++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index d2e9b4621..1fdc6d2a9 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -420,6 +420,20 @@ sub setup_oe_action_bar {
   }
 }
 
+sub setup_oe_search_action_bar {
+  my %params = @_;
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        t8('Search'),
+        submit    => [ '#form' ],
+        accesskey => 'enter',
+      ],
+    );
+  }
+}
+
 sub form_header {
   $main::lxdebug->enter_sub();
   my @custom_hiddens;
@@ -891,6 +905,8 @@ sub search {
 
   $::request->{layout}->use_javascript(map { "${_}.js" } qw(autocomplete_project));
 
+  setup_oe_search_action_bar();
+
   $form->header();
 
   print $form->parse_html_template('oe/search', {
@@ -1219,7 +1235,7 @@ sub orders {
   $report->add_separator();
   $report->add_data(create_subtotal_row(\%totals, \@columns, \%column_alignment, \@subtotal_columns, 'listtotal'));
 
-  $report->generate_with_headers();
+  $report->generate_with_headers(action_bar => 1);
 
   $main::lxdebug->leave_sub();
 }
diff --git a/templates/webpages/oe/search.html b/templates/webpages/oe/search.html
index fe1df7ef1..53b1a4764 100644
--- a/templates/webpages/oe/search.html
+++ b/templates/webpages/oe/search.html
@@ -10,7 +10,7 @@
 [%- SET vcdefault = 'old' _ vc %]
 [%- SET style="width: 250px" %]
 
-<form method="post" action="oe.pl">
+<form method="post" action="oe.pl" id="form">
 
 <table width="100%">
  <tr>
@@ -316,9 +316,7 @@
  </tr>
 </table>
 
-<br>
-<input type="hidden" name="nextsub" value="orders">
 <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
 <input type="hidden" name="type" value="[% HTML.escape(type) %]">
-<input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
+<input type="hidden" name="action" value="orders">
 </form>
-- 
2.20.1