From 48721f1b732eea47df7bbc8e2c55e392e11289e3 Mon Sep 17 00:00:00 2001
From: Christopher Brannon <cbrannon@cdalibrary.org>
Date: Fri, 5 Oct 2018 22:17:05 +0000
Subject: [PATCH] Bug 21503: Fail authorised values better/to code

To Test (Test both detail.pl and opac-detail.pl for functionality):
1) Apply patch (restart_all)
2) Look up an item that has a shelving location with a description
    defined (opac description too).
3) Remove opac description from shelving location.  Refresh
    opac-detail.pl and note that description fails back to the
    regular description.  Refresh detail.pl and note no change.
4) Remove regular description from shelving location.  Refresh
    opac-detail.pl and detail.pl.  Note that both default to the
    shelving location code.
5) Remove the shelving location from the LOC table all together.
    Refresh opac-detail.pl and detail.pl.  Note that both default to a
    blank shelving location.
---
 Koha/Template/Plugin/AuthorisedValues.pm | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/Koha/Template/Plugin/AuthorisedValues.pm b/Koha/Template/Plugin/AuthorisedValues.pm
index 2692c15..0484a81 100644
--- a/Koha/Template/Plugin/AuthorisedValues.pm
+++ b/Koha/Template/Plugin/AuthorisedValues.pm
@@ -82,12 +82,19 @@ sub GetDescriptionByKohaField {
             authorised_value => $params->{authorised_value},
         }
     );
-    return %$av
-            ? $params->{opac}
+    return $params->{opac}
                 ? $av->{opac_description}
+                    ? $av->{opac_description}
+                    : $av->{lib}
+                        ? $av->{lib}
+                        : $params->{authorised_value}
+                            ? $params->{authorised_value}
+                            : ''
                 : $av->{lib}
-            : ''; # Maybe we should return $params->{authorised_value}?
-
+                    ? $av->{lib}
+                    : $params->{authorised_value}
+                        ? $params->{authorised_value}
+                        : ''
 }
 
 1;
-- 
2.1.4