Pflichtenhefte: Exportoption bzgl. benutzerdefinierter Variablen in Suchmaske gefixt

diff --git a/SL/Controller/RequirementSpec.pm b/SL/Controller/RequirementSpec.pm
index b22e15f652026f1316fe1f7d12d43c5077f33bce..875f170733b8bd9c004803ff1b38daab238f5f0e 100644 (file)
--- a/SL/Controller/RequirementSpec.pm
+++ b/SL/Controller/RequirementSpec.pm
@@ -374,7 +374,7 @@ sub init_includeable_cvar_configs {
 
 sub init_include_cvars {
   my ($self) = @_;
 
 sub init_include_cvars {
   my ($self) = @_;

-  return $::form->{include_cvars} if $::form->{include_cvars} && (ref($::form->{include_cvars}) eq 'HASH');
+  return { map { ($_->name => $::form->{"include_cvars_" . $_->name}) }       @{ $self->cvar_configs } } if $::form->{_include_cvars_from_form};

   return { map { ($_->name => ($_->includeable && $_->included_by_default)) } @{ $self->cvar_configs } };
 }
 
   return { map { ($_->name => ($_->includeable && $_->included_by_default)) } @{ $self->cvar_configs } };
 }
 


@@ -516,6 +516,8 @@ sub prepare_report {
     %column_defs = (%column_defs, %cvar_column_defs);
   }
 
     %column_defs = (%column_defs, %cvar_column_defs);
   }
 

+  my @cvar_column_form_names = ('_include_cvars_from_form', map { "include_cvars_" . $_->name } @{ $self->includeable_cvar_configs });
+

   $report->set_options(
     std_column_visibility => 1,
     controller_class      => 'RequirementSpec',
   $report->set_options(
     std_column_visibility => 1,
     controller_class      => 'RequirementSpec',


@@ -528,7 +530,7 @@ sub prepare_report {
   );
   $report->set_columns(%column_defs);
   $report->set_column_order(@columns);
   );
   $report->set_columns(%column_defs);
   $report->set_column_order(@columns);

-  $report->set_export_options(qw(list filter));
+  $report->set_export_options(qw(list filter), @cvar_column_form_names);

   $report->set_options_from_form;
   $self->models->set_report_generator_sort_options(report => $report, sortable_columns => \@sortable);
 }
   $report->set_options_from_form;
   $self->models->set_report_generator_sort_options(report => $report, sortable_columns => \@sortable);
 }

diff --git a/templates/webpages/requirement_spec/_filter.html b/templates/webpages/requirement_spec/_filter.html
index 0fd06bd78c66eb8c9edfc85505391a1822810d3c..2e4209a12e91111b1ca6558348e231631e82df79 100644 (file)
--- a/templates/webpages/requirement_spec/_filter.html
+++ b/templates/webpages/requirement_spec/_filter.html
@@ -9,6 +9,7 @@
 
  <form method="post" action="controller.pl" id="search_form">
   [%- L.hidden_tag("is_template", is_template) %]
 
  <form method="post" action="controller.pl" id="search_form">
   [%- L.hidden_tag("is_template", is_template) %]

+  [%- L.hidden_tag("_include_cvars_from_form", 1) %]

 
   <p>
    <table>
 
   <p>
    <table>


@@ -56,7 +57,6 @@
      [% END %]
     [% END %]
 
      [% END %]
     [% END %]
 

-    [% L.hidden_tag("include_cvars.dummy__", 1) %]

     [% IF SELF.includeable_cvar_configs.size %]
      <tr>
       <th align="right">[% LxERP.t8("Include in Report") %]</th>
     [% IF SELF.includeable_cvar_configs.size %]
      <tr>
       <th align="right">[% LxERP.t8("Include in Report") %]</th>


@@ -66,7 +66,7 @@
          [% FOREACH cvar_cfg = SELF.includeable_cvar_configs %]
           <td>
            [% name__ = cvar_cfg.name;
          [% FOREACH cvar_cfg = SELF.includeable_cvar_configs %]
           <td>
            [% name__ = cvar_cfg.name;

-              L.checkbox_tag("include_cvars." _ name__, value="1", checked=(SELF.include_cvars.$name__ ? 1 : ''), label=cvar_cfg.description) %]
+              L.checkbox_tag("include_cvars_" _ name__, value="1", checked=(SELF.include_cvars.$name__ ? 1 : ''), label=cvar_cfg.description) %]

           </td>
           [%- IF !loop.last && ((loop.count % 3) == 0) %]
            </tr><tr>
           </td>
           [%- IF !loop.last && ((loop.count % 3) == 0) %]
            </tr><tr>