From 24fc43b9780260069c7aa1a328209f373d57e1bf Mon Sep 17 00:00:00 2001
From: Lari Taskula <lari.taskula@jns.fi>
Date: Tue, 7 Mar 2017 17:38:28 +0200
Subject: [PATCH] Bug 7534: (QA follow-up) Default pickup location to Yes when
 adding a new library

To test:
1. Apply the patches before this one
2. Go to /cgi-bin/koha/admin/branches.pl
3. Press New library button
4. Scroll down the page and observe Pickup location defaults to No
5. Apply this patch
6. Go to /cgi-bin/koha/admin/branches.pl
7. Press New library button
8. Scroll down the page and observe Pickup location now defaults to Yes

Signed-off-by: Koha Team AMU <axelle.clarisse@univ-amu.fr>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
index 28e2e4e17d..82ffb5b34b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
@@ -146,7 +146,7 @@
                 <li><label for="branchip">IP: </label><input type="text" name="branchip" id="branchip"  size="15" maxlength="15" value="[% library.branchip | html %]" /> <span class="hint">Can be entered as a single IP, or a subnet such as 192.168.1.*</span></li>
                 <li><label for="marcorgccode">MARC organization code</label> <input type="text" name="marcorgcode" id="marcorgcode" size="16" value="[% library.marcorgcode | html %]" /> <span class="hint">If not filled in defaults to system preference MARCOrgCode. You can obtain your code from <a href="http://www.loc.gov/marc/organizations/orgshome.html" target="_blank">Library of Congress</a>.</span>
                 <li><label for="branchnotes">Notes: </label><input type="text" name="branchnotes" id="branchnotes" size="80" value="[% library.branchnotes | html %]" /></li>
-                <li><label for="pickup_location">Pickup location: </label><select name="pickup_location" id="pickup_location"><option value="1" [% IF library.pickup_location %]selected[% END %]>Yes</option><option value="0" [% IF !library.pickup_location %]selected[% END %]>No</option></select></li>
+                <li><label for="pickup_location">Pickup location: </label><select name="pickup_location" id="pickup_location"><option value="1" [% IF !library || library.pickup_location == 1 %]selected="selected"[% END %]>Yes</option><option value="0" [% IF library && library.pickup_location == 0 %]selected="selected"[% END %]>No</option></select></li>
             </ol>
         </fieldset>
         <fieldset class="action">
-- 
2.39.5