From 357f49cdba561a9d2c145539adf8bdc8dbbb4b13 Mon Sep 17 00:00:00 2001 From: Jared Camins-Esakov Date: Tue, 13 Dec 2011 21:02:03 -0500 Subject: [PATCH 4/4] Bug 1633: Don't show image tab when inappropriate Content-Type: text/plain; charset="utf-8" This patch corrects the bug spotted by Owen Leonard where the Images tab was showing up even for records that didn't have local cover images attached to them. The tab is now hidden on the OPAC for records that don't have any images. In the Intranet, an Images tab will show for staff with permission to upload images, suggesting that they do so. For staff without that permission, the tab is not shown. Signed-off-by: Koustubha Kale --- .../prog/en/modules/catalogue/detail.tt | 8 +++++++- koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 2 +- opac/opac-imageviewer.pl | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index 9174d94..d8b5eae 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -228,7 +228,7 @@ function verify_images() { [% IF ( subscriptionsnumber ) %]
  • Subscriptions
  • [% END %] [% IF ( FRBRizeEditions ) %][% IF ( XISBNS ) %]
  • Editions
  • [% END %][% END %] [% IF ( AmazonSimilarItems ) %]
  • Related Titles
  • [% END %] -[% IF ( LocalCoverImages ) %]
  • Images
  • [% END %] +[% IF ( LocalCoverImages ) %][% IF ( localimages.0 || CAN_user_tools_upload_local_cover_images ) %]
  • Images
  • [% END %][% END %]
    @@ -519,12 +519,18 @@ function verify_images() { [% IF ( LocalCoverImages ) %]
    +[% IF ( localimages.0 ) %]
    Click on an image to view it in the image viewer
    [% FOREACH image IN localimages %] [% IF image %] img [% END %] [% END %] +[% ELSE %] +[% IF ( CAN_user_tools_upload_local_cover_images ) %] +

    No images have been uploaded for this bibliographic record yet. Please upload one.

    +[% END %] +[% END %]
    [% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt index 7f52117..95f4765 100755 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt @@ -548,7 +548,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () { Serial Collection [% END %] - [% IF ( OPACLocalCoverImages ) %]
  • Images
  • [% END %] + [% IF ( OPACLocalCoverImages ) %][% IF ( localimages.0 ) %]
  • Images
  • [% END %][% END %] [% IF ( serialcollection ) %] diff --git a/opac/opac-imageviewer.pl b/opac/opac-imageviewer.pl index 7bab178..31bfd28 100755 --- a/opac/opac-imageviewer.pl +++ b/opac/opac-imageviewer.pl @@ -46,7 +46,7 @@ if (C4::Context->preference("OPACLocalCoverImages")) { $template->{VARS}->{'OPACLocalCoverImages'} = 1; $template->{VARS}->{'images'} = \@images; $template->{VARS}->{'biblionumber'} = $biblionumber; - $template->{VARS}->{'imagenumber'} = $images[0] || ''; + $template->{VARS}->{'imagenumber'} = $imagenumber || $images[0] || ''; } $template->{VARS}->{'biblio'} = $biblio; -- 1.7.5.4