[Koha-patches] [PATCH] [followup] (bug #3710) all itemtypes if none selected

[Nicole Engard]

Has this and the follow up been pushed to 3.2?  I don't see this
option anywhere in HEAD.

On Mon, Oct 26, 2009 at 4:25 AM, Nahuel ANGELINETTI
<nahuel.angelinetti at biblibre.com> wrote:
> ---
>  C4/Search.pm                    |   11 ++++++++++-
>  catalogue/recentacquisitions.pl |    2 +-
>  opac/opac-recentacquisitions.pl |    2 +-
>  3 files changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/C4/Search.pm b/C4/Search.pm
> index ef80528..6c6e570 100644
> --- a/C4/Search.pm
> +++ b/C4/Search.pm
> @@ -1725,12 +1725,21 @@ sub SearchAcquisitions{
>         }else{
>             $str .= "AND biblioitems.itemtype=? ";
>         }
> +
> +        if(scalar(@$itemtypes) == 0){
> +            my $itypes = GetItemTypes();
> +            for my $key (keys %$itypes){
> +                push @$itemtypes, $key;
> +            }
> +        }
> +
>         @loopcriteria= @$itemtypes;
>     }elsif ($criteria=~/itemcallnumber/){
>         $str .= "AND (items.itemcallnumber LIKE CONCAT(?,'%')
>                  OR items.itemcallnumber is NULL
>                  OR items.itemcallnumber = '')";
> -        @loopcriteria = ("AA".."zz", "") unless (scalar(@loopcriteria)>0);
> +
> +        @loopcriteria = ("AA".."ZZ", "") unless (scalar(@loopcriteria)>0);
>     }else {
>         $str .= "AND biblio.title LIKE CONCAT(?,'%') ";
>         @loopcriteria = ("A".."z") unless (scalar(@loopcriteria)>0);
> diff --git a/catalogue/recentacquisitions.pl b/catalogue/recentacquisitions.pl
> index c0cc790..7adbbb7 100755
> --- a/catalogue/recentacquisitions.pl
> +++ b/catalogue/recentacquisitions.pl
> @@ -29,7 +29,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
>     }
>  );
>
> -my $op = $query->param('op');
> +my $op = $query->param('op') || '';
>  if ($op eq "show_list"){
>
>     my $datebegin           = C4::Dates->new($query->param('datebegin'));
> diff --git a/opac/opac-recentacquisitions.pl b/opac/opac-recentacquisitions.pl
> index 39d45f6..d721cdf 100755
> --- a/opac/opac-recentacquisitions.pl
> +++ b/opac/opac-recentacquisitions.pl
> @@ -31,7 +31,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
>
>  die() unless C4::Context->preference("OpacRecentAcquisitions");
>
> -my $op = $query->param('op');
> +my $op = $query->param('op') || '';
>  if ($op eq "show_list"){
>
>     my $datebegin           = C4::Dates->new($query->param('datebegin'));
> --
> 1.6.0.4
>
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha.org
> http://lists.koha.org/mailman/listinfo/koha-patches
>