Bugzilla – Attachment 17091 Details for
Bug 9928
no way to see all purchase suggestions at all
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 9928 - no way to see all purchase suggestions at all [3.10.x]
Bug-9928---no-way-to-see-all-purchase-suggestions-.patch (text/plain), 3.74 KB, created by
Kyle M Hall (khall)
on 2013-04-01 11:58:39 UTC
(
hide
)
Description:
Bug 9928 - no way to see all purchase suggestions at all [3.10.x]
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2013-04-01 11:58:39 UTC
Size:
3.74 KB
patch
obsolete
>From 1c29695f77b716e669e99f9d56563732d0b669e6 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >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 <nengard@bywatersolutions.com> >Works as described > >Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> > >http://bugs.koha-community.org/show_bug.cgi?id=9927 > >Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> >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(); }); > <fieldset class="rows"> <legend>Acquisition information</legend><ol> > <li><label for="branchcode">Library:</label> > <select name="branchcode" id="branchcode"> >- <option value="">Any</option>[% FOREACH branchloo IN branchloop %] >+ <option value="__ANY__">Any</option>[% FOREACH branchloo IN branchloop %] > [% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %]<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %][% END %] > </select> > </li> >@@ -558,7 +558,7 @@ $(document).ready(function() { calcNewsuggTotal(); }); > </select></li> > <li><label for="branchcode"> For:</label> > <select name="branchcode" id="branchcode"> >- <option value="">Any</option>[% FOREACH branchloo IN branchloop %] >+ <option value="__ANY__">Any</option>[% FOREACH branchloo IN branchloop %] > [% IF ( branchloo.selected ) %] <option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %] <option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %] > [% END %] > </select></li><li><input type="submit" value="Go" /></li></ol> >-- >1.7.2.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 9928
:
16891
|
16892
|
16998
|
17042
| 17091