Attachment 55356 Details for Bug 15758 – Bug 15758: [QA Follow-up] Corrections related to GetBranches

[patch] Bug 15758: [QA Follow-up] Corrections related to GetBranches

Bug-15758-QA-Follow-up-Corrections-related-to-GetB.patch (text/plain), 1.77 KB, created by Jonathan Druart on 2016-09-08 15:33:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2016-09-08 15:33:18 UTC

Size: 1.77 KB

patch

obsolete

>From 8be5052ece37af6d1a6e268b1c0e431579273b49 Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Date: Fri, 26 Aug 2016 13:22:31 +0200
>Subject: [PATCH] Bug 15758: [QA Follow-up] Corrections related to GetBranches
>
>[1] C4/Search
>A call to Koha::Libraries is added to routine pazGetRecords, but the
>results of that call are not used. So removing it again.
>
>[2] catalogue/itemsearch.pl
>Although A=>B=>C=>D works, we'd better use here A=>B, C=>D.
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> C4/Search.pm            | 3 +--
> catalogue/itemsearch.pl | 2 +-
> 2 files changed, 2 insertions(+), 3 deletions(-)
>
>diff --git a/C4/Search.pm b/C4/Search.pm
>index 7e71469..22e5718 100644
>--- a/C4/Search.pm
>+++ b/C4/Search.pm
>@@ -854,8 +854,7 @@ sub pazGetRecords {
>         $results_per_page, $offset,       $expanded_facet, $branches,
>         $query_type,       $scan
>     ) = @_;
>-
>-    $branches ||= { map { $_->branchcode => $_->branchname } Koha::Libraries->search };
>+    #NOTE: Parameter $branches is not used here !
> 
>     my $paz = C4::Search::PazPar2->new(C4::Context->config('pazpar2url'));
>     $paz->init();
>diff --git a/catalogue/itemsearch.pl b/catalogue/itemsearch.pl
>index 27c899a..21ee163 100755
>--- a/catalogue/itemsearch.pl
>+++ b/catalogue/itemsearch.pl
>@@ -247,7 +247,7 @@ if (scalar keys %params > 0) {
> if ($format eq 'html') {
>     # Retrieve data required for the form.
> 
>-    my @branches = map { value => $_->branchcode => label => $_->branchname }, Koha::Libraries->search( {}, { order_by => 'branchname' } );
>+    my @branches = map { value => $_->branchcode, label => $_->branchname }, Koha::Libraries->search( {}, { order_by => 'branchname' } );
>     my @locations;
>     foreach my $location (@$location_values) {
>         push @locations, {
>-- 
>2.8.1

Actions: View | Diff | Splinter Review

Attachments on bug 15758: 47746 | 47747 | 47748 | 47749 | 47750 | 47751 | 47752 | 47753 | 47759 | 47760 | 47761 | 47762 | 47763 | 47764 | 47765 | 52723 | 52724 | 52726 | 52727 | 52728 | 52729 | 52730 | 52731 | 52736 | 52788 | 52789 | 52790 | 52791 | 52792 | 52793 | 52794 | 52795 | 52913 | 52914 | 52915 | 52916 | 52917 | 52918 | 52919 | 52920 | 53893 | 53894 | 53895 | 53896 | 53897 | 53898 | 53899 | 53900 | 53997 | 53998 | 53999 | 54000 | 54001 | 54002 | 54003 | 54004 | 54029 | 54030 | 54031 | 54032 | 54033 | 54034 | 54035 | 54036 | 54037 | 54038 | 54039 | 54040 | 54041 | 54042 | 54043 | 54044 | 54861 | 54862 | 54863 | 54864 | 54865 | 54866 | 54867 | 54868 | 54908 | 54909 | 54921 | 54925 | 55061 | 55062 | 55063 | 55064 | 55065 | 55066 | 55067 | 55068 | 55069 | 55070 | 55071 | 55072 | 55073 | 55346 | 55347 | 55348 | 55349 | 55350 | 55351 | 55352 | 55353 | 55354 | 55355 | 55356 | 55357 | 55358 | 55445