View | Details | Raw Unified | Return to bug 35746
Collapse All | Expand All

(-)a/C4/Reports/Guided.pm (-1 / +1 lines)
Lines 974-980 sub GetParametersFromSQL { Link Here
974
974
975
    for ( my $i = 0; $i < ($#split/2) ; $i++ ) {
975
    for ( my $i = 0; $i < ($#split/2) ; $i++ ) {
976
        my ($name,$authval) = split(/\|/,$split[$i*2+1]);
976
        my ($name,$authval) = split(/\|/,$split[$i*2+1]);
977
        $authval =~ s/\:all$// if $authval;
977
        $authval =~ s/\:all$|\:in$// if $authval;
978
        push @sql_parameters, { 'name' => $name, 'authval' => $authval };
978
        push @sql_parameters, { 'name' => $name, 'authval' => $authval };
979
    }
979
    }
980
980
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt (-1 / +1 lines)
Lines 883-889 Link Here
883
                                        [% ELSE %]
883
                                        [% ELSE %]
884
                                            <li>
884
                                            <li>
885
                                                <label for="sql_params_[% sql_param.labelid | html %]">[% sql_param.entry | html %]:</label>
885
                                                <label for="sql_params_[% sql_param.labelid | html %]">[% sql_param.entry | html %]:</label>
886
                                                <select name="[%- sql_param.input.name | html -%]" tabindex="1"  id="[%- sql_param.input.id | html -%]">
886
                                                <select name="[%- sql_param.input.name | html -%]" tabindex="1"  id="[%- sql_param.input.id | html -%]"  [%- sql_param.select_multiple | html -%]>
887
                                                    [% IF (sql_param.include_all) %]
887
                                                    [% IF (sql_param.include_all) %]
888
                                                        <option value="%">All</option>
888
                                                        <option value="%">All</option>
889
                                                    [% END %]
889
                                                    [% END %]
(-)a/reports/guided_reports.pl (-3 / +9 lines)
Lines 710-716 elsif ($phase eq 'Run this report'){ Link Here
710
                if( defined $uniq_params{$text.$sep.$authorised_value_all} ){
710
                if( defined $uniq_params{$text.$sep.$authorised_value_all} ){
711
                    next;
711
                    next;
712
                } else { $uniq_params{$text.$sep.$authorised_value_all} = "$i"; }
712
                } else { $uniq_params{$text.$sep.$authorised_value_all} = "$i"; }
713
                my ($authorised_value, $all) = split /:/, $authorised_value_all;
713
                my ($authorised_value, $param_options) = split /:/, $authorised_value_all;
714
                my $all;
715
                my $multiple;
716
                if ($param_options eq "all") {
717
                    $all = "all";
718
                } elsif ($param_options eq "in") {
719
                    $multiple = "multiple";
720
                }
714
                my $input;
721
                my $input;
715
                my $labelid;
722
                my $labelid;
716
                if ( not defined $authorised_value ) {
723
                if ( not defined $authorised_value ) {
Lines 829-835 elsif ($phase eq 'Run this report'){ Link Here
829
                    };
836
                    };
830
                }
837
                }
831
838
832
                push @tmpl_parameters, {'entry' => $text, 'input' => $input, 'labelid' => $labelid, 'name' => $text.$sep.$authorised_value_all, 'include_all' => $all };
839
                push @tmpl_parameters, {'entry' => $text, 'input' => $input, 'labelid' => $labelid, 'name' => $text.$sep.$authorised_value_all, 'include_all' => $all, 'select_multiple' => $multiple};
833
            }
840
            }
834
            $template->param('sql'         => $sql,
841
            $template->param('sql'         => $sql,
835
                            'name'         => $name,
842
                            'name'         => $name,
836
- 

Return to bug 35746