From c4713436b68fcaad7f7f14ace8d28aefb820a1e4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Sven=20Sch=C3=B6ling?= <s.schoeling@linet-services.de>
Date: Mon, 23 Apr 2012 17:21:33 +0200
Subject: [PATCH] =?utf8?q?filter=5Fprefix=20f=C3=BCr=20CVar->render=5Fsear?=
 =?utf8?q?ch=5Foptions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 SL/CVar.pm                                   |  1 +
 templates/webpages/amcvar/search_filter.html | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/SL/CVar.pm b/SL/CVar.pm
index 6d04f35a9..714744a1a 100644
--- a/SL/CVar.pm
+++ b/SL/CVar.pm
@@ -402,6 +402,7 @@ sub render_search_options {
 
   $params{include_prefix}   = 'l_' unless defined($params{include_prefix});
   $params{include_value}  ||= '1';
+  $params{filter_prefix}  ||= '';
 
   my $filter  = $form->parse_html_template('amcvar/search_filter',  \%params);
   my $include = $form->parse_html_template('amcvar/search_include', \%params);
diff --git a/templates/webpages/amcvar/search_filter.html b/templates/webpages/amcvar/search_filter.html
index db37d08a7..37f722b12 100644
--- a/templates/webpages/amcvar/search_filter.html
+++ b/templates/webpages/amcvar/search_filter.html
@@ -8,7 +8,7 @@
     <td valign="top">
 
      [%- IF var.type == 'bool' %]
-     <select name="cvar_[% HTML.escape(var.name) %]">
+     <select name="[% filter_prefix %]cvar_[% HTML.escape(var.name) %]">
       <option value="">---</option>
       <option value="yes">[% 'Yes' | $T8 %]</option>
       <option value="no">[% 'No' | $T8 %]</option>
@@ -16,10 +16,10 @@
 
      [%- ELSIF var.type == 'date' %]
      [% 'from (time)' | $T8 %]
-     <input name="cvar_[% HTML.escape(var.name) %]_from" id="cvar_[% HTML.escape(var.name) %]_from" size="12">
+     <input name="[% filter_prefix %]cvar_[% HTML.escape(var.name) %]_from" id="cvar_[% HTML.escape(var.name) %]_from" size="12">
      <input type="button" name="cvar_[% HTML.escape(var.name) %]_from_button" id="cvar_[% HTML.escape(var.name) %]_from_trigger" value="?">
      [% 'to (time)' | $T8 %]
-     <input name="cvar_[% HTML.escape(var.name) %]_to" id="cvar_[% HTML.escape(var.name) %]_to" size="12">
+     <input name="[% filter_prefix %]cvar_[% HTML.escape(var.name) %]_to" id="cvar_[% HTML.escape(var.name) %]_to" size="12">
      <input type="button" name="cvar_[% HTML.escape(var.name) %]_to_button" id="cvar_[% HTML.escape(var.name) %]_to_trigger" value="?">
 
      <script type="text/javascript">
@@ -36,7 +36,7 @@
      </script>
 
      [%- ELSIF var.type == 'number' %]
-     <select name="cvar_[% HTML.escape(var.name) %]_qtyop">
+     <select name="[% filter_prefix %]cvar_[% HTML.escape(var.name) %]_qtyop">
       <option selected>==</option>
       <option>=/=</option>
       <option>&gt;</option>
@@ -47,10 +47,10 @@
      <input name="cvar_[% HTML.escape(var.name) %]"[% IF var.maxlength %]maxlength="[% HTML.escape(var.maxlength) %]"[% END %]>
 
      [%- ELSIF var.type == 'customer' %]
-     <input name="cvar_[% var.name | html %]">
+     <input name="[% filter_prefix %]cvar_[% var.name | html %]">
 
      [% ELSIF var.type == 'select' %]
-     <select name="cvar_[% HTML.escape(var.name) %]">
+     <select name="[% filter_prefix %]cvar_[% HTML.escape(var.name) %]">
       <option value="" selected>---</option>
       [%- FOREACH option = var.OPTIONS %]
       <option>[% HTML.escape(option.value) %]</option>
@@ -58,7 +58,7 @@
      </select>
 
      [%- ELSE %]
-     <input name="cvar_[% HTML.escape(var.name) %]"[% IF var.maxlength %]maxlength="[% HTML.escape(var.maxlength) %]"[% END %]>
+     <input name="[% filter_prefix %]cvar_[% HTML.escape(var.name) %]"[% IF var.maxlength %]maxlength="[% HTML.escape(var.maxlength) %]"[% END %]>
 
      [%- END %]
     </td>
-- 
2.20.1