From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Mon, 16 Jan 2017 11:00:31 +0000 (+0100)
Subject: ActionBar: Verwendung bei Preisregeln standardisiert
X-Git-Tag: release-3.5.4~1317
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=8cba44f6b5cab5c4685d04dc8fc636dcf39e8b3a;p=kivitendo-erp.git

ActionBar: Verwendung bei Preisregeln standardisiert

• »Suchen« → »Erneuern«
• »Zurücksetzen« in Form verschoben
---

diff --git a/SL/Controller/PriceRule.pm b/SL/Controller/PriceRule.pm
index 2ced8edd7..3b1c8c2e1 100644
--- a/SL/Controller/PriceRule.pm
+++ b/SL/Controller/PriceRule.pm
@@ -311,14 +311,10 @@ sub setup_search_action_bar {
   for my $bar ($::request->layout->get('actionbar')) {
     $bar->add(
       action => [
-        t8('Search'),
+        t8('Update'),
         submit    => [ '#search_form', { action => 'PriceRule/list' } ],
         accesskey => 'enter',
       ],
-      action => [
-        t8('Reset'),
-        call => [ 'kivi.PriceRule.reset_search_form' ],
-      ],
 
       combobox => [
         action => [
diff --git a/templates/webpages/price_rule/_filter.html b/templates/webpages/price_rule/_filter.html
index 826191bf6..c11585b74 100644
--- a/templates/webpages/price_rule/_filter.html
+++ b/templates/webpages/price_rule/_filter.html
@@ -83,13 +83,13 @@
      [%- END %]
    </td>
   </tr>
-
  </table>
 
 [% L.hidden_tag('sort_by', FORM.sort_by) %]
 [% L.hidden_tag('sort_dir', FORM.sort_dir) %]
 [% L.hidden_tag('page', FORM.page) %]
 
+ [% L.button_tag("\$('#search_form').resetForm()", LxERP.t8("Reset")) %]
 </div>
 
 </form>