From 3f5dbee3b3fe02d703c4b04da5d138854ff47088 Mon Sep 17 00:00:00 2001 From: Srdjan Jankovic Date: Fri, 22 Jul 2011 16:01:36 +1200 Subject: [PATCH 1/1] bug_5928: AllowPurchaseSuggestionBranchChoice opac pref Introduced branchnamesuggestedfor; display it on opac Purchase Suggestions --- C4/Suggestions.pm | 4 +++- .../prog/en/modules/admin/preferences/opac.pref | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/C4/Suggestions.pm b/C4/Suggestions.pm index 1a93f2e..41777bb 100644 --- a/C4/Suggestions.pm +++ b/C4/Suggestions.pm @@ -105,7 +105,8 @@ sub SearchSuggestion { B2.branchname AS branchnamesuggestedby, U2.email AS emailmanagedby, U2.branchcode AS branchcodemanagedby, - U2.borrowernumber AS borrnummanagedby + U2.borrowernumber AS borrnummanagedby, + B3.branchname AS branchnamesuggestedfor FROM suggestions LEFT JOIN borrowers AS U1 ON suggestedby=U1.borrowernumber LEFT JOIN branches AS B1 ON B1.branchcode=U1.branchcode @@ -113,6 +114,7 @@ sub SearchSuggestion { LEFT JOIN borrowers AS U2 ON managedby=U2.borrowernumber LEFT JOIN branches AS B2 ON B2.branchcode=U2.branchcode LEFT JOIN categories AS C2 ON C2.categorycode = U2.categorycode + LEFT OUTER JOIN branches AS B3 ON B3.branchcode=suggestions.branchcode WHERE STATUS NOT IN ('CLAIMED') } , map { if ( my $s = $suggestion->{$_} ) { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref index f4be568..9f82b9e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -339,7 +339,12 @@ OPAC: type: textarea class: code - Allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations. - + - + - pref: SearchMyLibraryFirst + choices: + yes: Limit + no: "Don't limit" + - "patrons' searches to the library they are registered at." Privacy: - - pref: AnonSuggestions -- 1.6.5