From 1c29695f77b716e669e99f9d56563732d0b669e6 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Tue, 26 Mar 2013 09:58:57 -0400 Subject: [PATCH] Bug 9928 - no way to see all purchase suggestions at all [3.10.x] Test Plan: 1) Apply patch 3) Create suggestions for multiple libraries 2) Select 'Any' for the 'For' field under 'Acquisition information' 3) Note you are seeing the suggestions for all branches Signed-off-by: Nicole C. Engard Works as described Signed-off-by: Chris Cormack http://bugs.koha-community.org/show_bug.cgi?id=9927 Signed-off-by: Katrin Fischer Patch fixes wrong behaviour. All tests and QA script pass. --- C4/Suggestions.pm | 13 ++++++++++++- .../prog/en/modules/suggestion/suggestion.tt | 4 ++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/C4/Suggestions.pm b/C4/Suggestions.pm index 0cb484a..eedfcbd 100644 --- a/C4/Suggestions.pm +++ b/C4/Suggestions.pm @@ -132,11 +132,22 @@ sub SearchSuggestion { push @query,q{ and (suggestions.branchcode = ? or suggestions.branchcode ='')}; } } + } else { + if ( defined $suggestion->{branchcode} && $suggestion->{branchcode} ) { + unless ( $suggestion->{branchcode} eq '__ANY__' ) { + push @sql_params, $suggestion->{branchcode}; + push @query, qq{ AND suggestions.branchcode=? }; + } + } else { + push @query, qq{ + AND (suggestions.branchcode='' OR suggestions.branchcode IS NULL) + }; + } } foreach my $field (grep { my $fieldname=$_; any {$fieldname eq $_ } qw< - STATUS branchcode itemtype suggestedby managedby acceptedby + STATUS itemtype suggestedby managedby acceptedby bookfundid biblionumber >} keys %$suggestion ) { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt index fb73fd1..d32e2bd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt @@ -325,7 +325,7 @@ $(document).ready(function() { calcNewsuggTotal(); });
Acquisition information
  1. @@ -558,7 +558,7 @@ $(document).ready(function() { calcNewsuggTotal(); });
-- 1.7.2.5