From 92e262ca535bd84927263db0ccc5b7e2c435c482 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Fri, 7 Aug 2020 13:37:30 +0100
Subject: [PATCH] Bug 24201: (QA follow-up) IndependentBranches

This patch updates the IndependentBranches template display logic such
that the 'Select desk' and 'Select library and desk' options appear
correctly when IndependentBranches is enabled.
---
 .../intranet-tmpl/prog/en/includes/circ-nav.inc     |  6 ++++--
 koha-tmpl/intranet-tmpl/prog/en/includes/header.inc | 13 ++++---------
 .../prog/en/modules/circ/set-library.tt             |  8 +++-----
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc
index 03b7c0bd0b..14931325fd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc
@@ -15,13 +15,15 @@
             [% IF !Koha.Preference('IndependentBranchesTransfers') || CAN_user_superlibrarian %]
                 <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfer</a></li>
             [% END %]
-            [% IF ( AutoLocation ) %][% ELSE %][% IF ( IndependentBranches ) %][% ELSE %]
+            [% IF !( Koha.Preference('IndependentBranches') && !CAN_user_superlibrarian && !CAN_user_editcatalogue_edit_catalogue ) %]
                 [% IF Koha.Preference('UseCirculationDesks') %]
                 <li><a href="/cgi-bin/koha/circ/set-library.pl">Set library and desk</a></li>
                 [% ELSE %]
                 <li><a href="/cgi-bin/koha/circ/set-library.pl">Set library</a></li>
                 [% END %]
-            [% END %][% END %]
+            [% ELSIF Koha.Preference('UseCirculationDesks') %]
+                <li><a href="/cgi-bin/koha/circ/set-library.pl">Set desk</a></li>
+            [% END %]
             [% IF ( fast_cataloging ) %][% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
                 <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA">Fast cataloging</a></li>
             [% END %][% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index 39642d1d11..494c70f8e0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -130,9 +130,8 @@
                     </li>
                     [% END %]
 
+                    [% IF !( Koha.Preference('IndependentBranches') && !CAN_user_superlibrarian && !CAN_user_editcatalogue_edit_catalogue ) %]
                     <li role="separator" class="loggedin-menu-label divider"></li>
-                    [% IF ( IndependentBranches ) %]
-                        [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
                     <li>
                         [% IF Koha.Preference('UseCirculationDesks') %]
                         <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library and desk</a>
@@ -140,14 +139,10 @@
                         <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library</a>
                         [% END %]
                     </li>
-                        [% END %]
-                    [% ELSE %]
+                    [% ELSIF Koha.Preference('UseCirculationDesks') %]
+                    <li role="separator" class="loggedin-menu-label divider"></li>
                     <li>
-                        [% IF Koha.Preference('UseCirculationDesks') %]
-                        <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library and desk</a>
-                        [% ELSE %]
-                        <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library</a>
-                        [% END %]
+                        <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set desk</a>
                     </li>
                     [% END %]
                     [% IF EnableSearchHistory %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt
index 3974687940..3d358bdb94 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt
@@ -64,20 +64,18 @@ Updated:<ul>
 [% ELSE %]
 
 <form method="post" action="set-library.pl">
+[% IF !( Koha.Preference('IndependentBranches') && !CAN_user_superlibrarian && !CAN_user_editcatalogue_edit_catalogue ) %]
 <fieldset class="rows">
     <legend>Set library</legend>
     <ol>
-    [% IF ( singleBranchMode && !CAN_user_superlibrarian ) %]
-        <li>SingleBranchMode is ON.</li>
-    [% ELSE %]
         <li><label for="branch">Choose library:</label>
         <select name="branch" id="branch">
             [% PROCESS options_for_libraries libraries => Branches.all( selected => branch ) %]
         </select></li>
-    [% END %]
     </ol>
 </fieldset>
-[% IF Desks.all %]
+[% END %]
+[% IF Koha.Preference('UseCirculationDesks') && Desks.all %]
 <fieldset class="rows">
     <legend>Set desk</legend>
     <ol>
-- 
2.20.1