filter_prefix für CVar->render_search_options

diff --git a/SL/CVar.pm b/SL/CVar.pm
index 6d04f35a9ed0029f6920f2d44754c063ba7068e8..714744a1acbddf79f859c19a1ac8942c04d0d374 100644 (file)
--- 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{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);
 
   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 db37d08a7ec300f5d66e653786edd037fc2b30f3..37f722b12463c49766f2bb49d306ff4b939588f7 100644 (file)
--- 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' %]
     <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>
       <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 %]
 
      [%- 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 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">
      <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' %]
      </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>
       <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_[% 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' %]
 
      [% 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>
       <option value="" selected>---</option>
       [%- FOREACH option = var.OPTIONS %]
       <option>[% HTML.escape(option.value) %]</option>


@@ -58,7 +58,7 @@
      </select>
 
      [%- ELSE %]
      </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>
 
      [%- END %]
     </td>