Bug 9875: Hide empty items tab

The two holdings tabs displayed whether
or not there is anything to go in them.

Signed-off-by: Corinne Bulac <corinne.hayet@bulac.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
If one item list is empty, no empty tab is shown.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>

diff --git a/catalogue/detail.pl b/catalogue/detail.pl
index ec6f6eb..a5b32c6 100755 (executable)
--- a/catalogue/detail.pl
+++ b/catalogue/detail.pl
@@ -281,6 +281,14 @@ foreach my $item (@items) {
     }
 }
 
+# Display only one tab if one items list is empty
+if (scalar(@itemloop) == 0 || scalar(@otheritemloop) == 0) {
+    $template->param(SeparateHoldings => 0);
+    if (scalar(@itemloop) == 0) {
+        @itemloop = @otheritemloop;
+    }
+}
+
 $template->param( norequests => $norequests );
 $template->param(
        MARCNOTES   => $marcnotesarray,

diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index 883ea7c..4371f65 100755 (executable)
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -576,6 +576,14 @@ for my $itm (@items) {
     }
 }
 
+# Display only one tab if one items list is empty
+if (scalar(@itemloop) == 0 || scalar(@otheritemloop) == 0) {
+    $template->param(SeparateHoldings => 0);
+    if (scalar(@itemloop) == 0) {
+        @itemloop = @otheritemloop;
+    }
+}
+
 # If there is a lot of items, and the user has not decided
 # to view them all yet, we first warn him
 # TODO: The limit of 50 could be a syspref