From b7a2ce69d875a64b5468ad475f0a3167266ff8b3 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Fri, 7 Aug 2020 15:20:55 +0100
Subject: [PATCH] Bug 24201: (QA follow-up) Make logic consistent

The display logic for the desk details in the header bar was
inconsistent between the narrow display view and the full width display
view.  This patch updates the former to match the latter.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 koha-tmpl/intranet-tmpl/prog/en/includes/header.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index 494c70f8e0..a74d5130b4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -118,12 +118,12 @@
                         [% END %]
                     </li>
 
-                    [% IF Koha.Preference('UseCirculationDesks') %]
+                    [% IF Koha.Preference('UseCirculationDesks') && Desks.ListForLibrary.count %]
                     <li class="loggedin-menu-label">
                         Desk: <br />
-                        [% IF ( Desks.GetLoggedInDeskName == '' AND Desks.ListForLibrary.count ) %]
+                        [% IF ( Desks.GetLoggedInDeskName == '' ) %]
                            <span class="logged-in-desk-name">NO DESK SET</span>
-                        [% ELSIF ( Desks.GetLoggedInDeskName != '' ) %]
+                        [% ELSE %]
                             <span class="logged-in-desk-name">[% Desks.GetLoggedInDeskName | html %]</span>
                             <span class="logged-in-desk-id content_hidden">[% Desks.GetLoggedInDeskId | html %]</span>
                         [% END %]
-- 
2.20.1