Bugzilla – Attachment 16892 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
Bug-9928---no-way-to-see-all-purchase-suggestions-.patch (text/plain), 3.46 KB, created by
Nicole C. Engard
on 2013-03-26 14:08:51 UTC
(
hide
)
Description:
Bug 9928 - no way to see all purchase suggestions at all
Filename:
MIME Type:
Creator:
Nicole C. Engard
Created:
2013-03-26 14:08:51 UTC
Size:
3.46 KB
patch
obsolete
>From b917422e7631867d541d6d3f3c3b4420b5f4317a 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 > >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 >--- > 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 ddd1d6a..131f117 100644 >--- a/C4/Suggestions.pm >+++ b/C4/Suggestions.pm >@@ -143,11 +143,22 @@ sub SearchSuggestion { > }; > } > } >+ } 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) >+ }; >+ } > } > > # filter on nillable fields > foreach my $field ( >- qw( STATUS branchcode itemtype suggestedby managedby acceptedby budgetid biblionumber ) >+ qw( STATUS itemtype suggestedby managedby acceptedby budgetid biblionumber ) > ) > { > if ( exists $suggestion->{$field} ) { >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 fcb8eca..f8566c9 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> >@@ -555,7 +555,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.3
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