From a0bfd36a36ef03335a8190957b783fb6e0383040 Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Fri, 27 May 2016 15:43:04 +0300
Subject: [PATCH] Handle pickup location in storage retrieval request form the
same as in hold form. Fixes translation of pickup location and
"user-selected" default pickup location when there's only one choice.
---
.../templates/record/storageretrievalrequest.phtml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/themes/bootstrap3/templates/record/storageretrievalrequest.phtml b/themes/bootstrap3/templates/record/storageretrievalrequest.phtml
index 918104e04da..939bf9d3643 100644
--- a/themes/bootstrap3/templates/record/storageretrievalrequest.phtml
+++ b/themes/bootstrap3/templates/record/storageretrievalrequest.phtml
@@ -62,7 +62,7 @@
<? endif; ?>
<? if (in_array("pickUpLocation", $this->extraFields)): ?>
- <? if (count($this->pickup) > 1): ?>
+ <? if ($this->pickup): ?>
<div class="form-group">
<?
if (isset($this->gatheredDetails['pickUpLocation']) && $this->gatheredDetails['pickUpLocation'] !== "") {
@@ -76,14 +76,14 @@
<label class="col-sm-3 control-label"><?=$this->transEsc("pick_up_location")?>:</label>
<div class="col-sm-9">
<select name="gatheredDetails[pickUpLocation]" class="form-control">
- <? if ($selected === false): ?>
+ <? if ($selected === false && count($this->pickup) > 1): ?>
<option value="" selected="selected">
<?=$this->transEsc('select_pickup_location')?>
</option>
<? endif; ?>
<? foreach ($this->pickup as $lib): ?>
<option value="<?=$this->escapeHtmlAttr($lib['locationID'])?>"<?=($selected == $lib['locationID']) ? ' selected="selected"' : ''?>>
- <?=$this->escapeHtml($lib['locationDisplay'])?>
+ <?=$this->transEsc('location_' . $lib['locationDisplay'], null, $lib['locationDisplay'])?>
</option>
<? endforeach; ?>
</select>
--
GitLab