Attachment 107967 Details for Bug 24201 – Bug 24201: (QA follow-up) Make logic consistent

[patch] Bug 24201: (QA follow-up) Make logic consistent

Bug-24201-QA-follow-up-Make-logic-consistent.patch (text/plain), 1.81 KB, created by Martin Renvoize (ashimema) on 2020-08-07 14:22:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2020-08-07 14:22:37 UTC

Size: 1.81 KB

patch

obsolete

>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: 
>- [% IF ( Desks.GetLoggedInDeskName == '' AND Desks.ListForLibrary.count ) %]
>+ [% IF ( Desks.GetLoggedInDeskName == '' ) %]
> NO DESK SET
>- [% ELSIF ( Desks.GetLoggedInDeskName != '' ) %]
>+ [% ELSE %]
> [% Desks.GetLoggedInDeskName | html %]
> [% Desks.GetLoggedInDeskId | html %]
> [% END %]
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 24201: 96158 | 96164 | 96165 | 96166 | 101452 | 101564 | 101684 | 101697 | 101704 | 101705 | 101848 | 101865 | 101866 | 101877 | 101878 | 101879 | 101880 | 101881 | 101882 | 101883 | 103839 | 103840 | 105795 | 105869 | 105873 | 105874 | 105875 | 106576 | 107089 | 107090 | 107091 | 107092 | 107093 | 107094 | 107095 | 107096 | 107097 | 107667 | 107668 | 107669 | 107670 | 107671 | 107672 | 107673 | 107674 | 107675 | 107676 | 107677 | 107678 | 107679 | 107680 | 107728 | 107729 | 107730 | 107731 | 107732 | 107750 | 107751 | 107752 | 107815 | 107816 | 107817 | 107818 | 107951 | 107952 | 107967 | 107968 | 107980 | 107981