From d2bf92f9607ac8ea1a06379094286bc640510830 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Date: Thu, 3 Feb 2011 12:48:07 +0100 Subject: [PATCH] Bug 5687: Add pref StaffAuthorisedValueImages for staff search results Content-Type: text/plain; charset="utf-8" This patch contains the functionality, not the install stuff. --- catalogue/search.pl | 3 +++ .../en/modules/admin/preferences/staff-client.pref | 6 ++++++ .../prog/en/modules/catalogue/results.tmpl | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/catalogue/search.pl b/catalogue/search.pl index 8cb737d..ec5015c 100755 --- a/catalogue/search.pl +++ b/catalogue/search.pl @@ -538,6 +538,9 @@ for (my $i=0;$i<@servers;$i++) { } exit; } + unless(C4::Context->preference("StaffAuthorisedValueImages")) { + $_->{noauthimg}=1 for @newresults; #enh 5687 + } if ($hits) { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff-client.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff-client.pref index ab546f1..a95eb8b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff-client.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff-client.pref @@ -63,6 +63,12 @@ Staff Client: choices: local: "included with Koha (faster, will work if internet goes down)." "http://yui.yahooapis.com/2.5.1/build": "from Yahoo's own servers (less demand on your servers)." + - + - pref: StaffAuthorisedValueImages + choices: + yes: Show + no: "Don't show" + - images for <a href="/cgi-bin/koha/admin/authorised_values.pl">authorized values</a> (such as lost statuses and locations) in search results. Options: - - pref: viewMARC diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl index 592f3f4..ff2c687 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl @@ -438,7 +438,7 @@ function GetZ3950Terms(){ </p> <!-- TMPL_IF NAME="searchhighlightblob" --><p class="searchhighlightblob"><!-- TMPL_VAR NAME="searchhighlightblob" --></p><!-- /TMPL_IF --> - <!-- TMPL_IF NAME="authorised_value_images" --> + <!-- TMPL_UNLESS NAME="noauthimg"--><!-- TMPL_IF NAME="authorised_value_images" --> <p> <!-- TMPL_LOOP NAME="authorised_value_images" --> <img src="<!-- TMPL_VAR name="imageurl" -->" alt="<!-- TMPL_VAR NAME="description" -->" /> @@ -446,7 +446,7 @@ function GetZ3950Terms(){ </p> <!-- /TMPL_IF --> - <!-- /TMPL_IF --> + <!-- /TMPL_IF --><!-- /TMPL_UNLESS --> <p class="hold"><!-- TMPL_IF NAME="norequests" --> <span class="noholdstext">No holds allowed</span> <!-- TMPL_ELSE --> -- 1.6.0.6