From a6d4bd9f8dd22ed7a44962e3fb28b487eb3c14a4 Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Thu, 11 Jun 2015 13:55:48 +0300
Subject: [PATCH] Fixed the display of pickup library (and consequently the
library-dependent location list handling) in the ILL request form in case
there is only one library available.
---
.../templates/record/illrequest.phtml | 44 ++++++++++---------
.../templates/record/illrequest.phtml | 38 +++++++++-------
2 files changed, 45 insertions(+), 37 deletions(-)
diff --git a/themes/blueprint/templates/record/illrequest.phtml b/themes/blueprint/templates/record/illrequest.phtml
index fe0b89bd33a..877b2e28d03 100644
--- a/themes/blueprint/templates/record/illrequest.phtml
+++ b/themes/blueprint/templates/record/illrequest.phtml
@@ -29,26 +29,30 @@
</select>
</div>
<? endif; ?>
-
- <? if (in_array("pickUpLibrary", $this->extraFields)): ?>
+
+ <? if (in_array("pickUpLibrary", $this->extraFields) && !empty($this->pickupLibraries)): ?>
<div>
- <? if (count($this->pickupLibraries) > 1): ?>
- <?
- if (isset($this->gatheredDetails['pickUpLibrary']) && $this->gatheredDetails['pickUpLibrary'] !== "") {
- $selected = $this->gatheredDetails['pickUpLibrary'];
- } else {
- $selected = false;
- }
- ?>
<strong><?=$this->transEsc("ill_request_pick_up_library")?>:</strong><br/>
- <select id="pickupLibrary" name="gatheredDetails[pickUpLibrary]">
- <? foreach ($this->pickupLibraries as $lib): ?>
- <option value="<?=$this->escapeHtmlAttr($lib['id'])?>"<?=(($selected === false && isset($lib['isDefault']) && $lib['isDefault']) || $selected === $lib['id']) ? ' selected="selected"' : ''?>>
- <?=$this->transEsc('library_' . $lib['name'], null, $lib['name'])?>
- </option>
- <? endforeach; ?>
- </select>
- <? endif; ?>
+ <? if (count($this->pickupLibraries) > 1): ?>
+ <?
+ if (isset($this->gatheredDetails['pickUpLibrary']) && $this->gatheredDetails['pickUpLibrary'] !== "") {
+ $selected = $this->gatheredDetails['pickUpLibrary'];
+ } else {
+ $selected = false;
+ }
+ ?>
+ <select id="pickupLibrary" name="gatheredDetails[pickUpLibrary]">
+ <? foreach ($this->pickupLibraries as $lib): ?>
+ <option value="<?=$this->escapeHtmlAttr($lib['id'])?>"<?=(($selected === false && isset($lib['isDefault']) && $lib['isDefault']) || $selected === $lib['id']) ? ' selected="selected"' : ''?>>
+ <?=$this->transEsc('library_' . $lib['name'], null, $lib['name'])?>
+ </option>
+ <? endforeach; ?>
+ </select>
+ <? else: ?>
+ <? $lib = $this->pickupLibraries[0]; ?>
+ <input type="text" size="40" readonly="readonly" value="<?=$this->escapeHtmlAttr($this->translate('library_' . $lib['name'], null, $lib['name']))?>" />
+ <input type="hidden" id="pickupLibrary" name="gatheredDetails[pickUpLibrary]" value="<?=$this->escapeHtmlAttr($lib['id'])?>" />
+ <? endif; ?>
</div>
<? endif; ?>
@@ -64,7 +68,7 @@
</select>
</div>
<? endif; ?>
-
+
<? if (in_array("pickUpLocation", $this->extraFields)): ?>
<div>
<? if (count($this->pickupLocations) > 1): ?>
@@ -88,7 +92,7 @@
<? endif; ?>
</div>
<? endif; ?>
-
+
<? if (in_array("requiredByDate", $this->extraFields)): ?>
<div>
<strong><?=$this->transEsc("hold_required_by")?>: </strong>
diff --git a/themes/bootstrap3/templates/record/illrequest.phtml b/themes/bootstrap3/templates/record/illrequest.phtml
index 60a3c12f165..49e2074a521 100644
--- a/themes/bootstrap3/templates/record/illrequest.phtml
+++ b/themes/bootstrap3/templates/record/illrequest.phtml
@@ -31,27 +31,31 @@
</div>
<? endif; ?>
- <? if (in_array("pickUpLibrary", $this->extraFields)): ?>
+ <? if (in_array("pickUpLibrary", $this->extraFields) && !empty($this->pickupLibraries)): ?>
<div class="form-group">
- <? if (count($this->pickupLibraries) > 1): ?>
- <?
- if (isset($this->gatheredDetails['pickUpLibrary']) && $this->gatheredDetails['pickUpLibrary'] !== "") {
- $selected = $this->gatheredDetails['pickUpLibrary'];
- } else {
- $selected = false;
- }
- ?>
<label class="col-sm-3 control-label"><?=$this->transEsc("ill_request_pick_up_library")?>:</label>
<div class="col-sm-9">
- <select id="pickupLibrary" name="gatheredDetails[pickUpLibrary]" class="form-control">
- <? foreach ($this->pickupLibraries as $lib): ?>
- <option value="<?=$this->escapeHtmlAttr($lib['id'])?>"<?=(($selected === false && isset($lib['isDefault']) && $lib['isDefault']) || $selected === $lib['id']) ? ' selected="selected"' : ''?>>
- <?=$this->transEsc('library_' . $lib['name'], null, $lib['name'])?>
- </option>
- <? endforeach; ?>
- </select>
+ <? if (count($this->pickupLibraries) > 1): ?>
+ <select id="pickupLibrary" name="gatheredDetails[pickUpLibrary]" class="form-control">
+ <?
+ if (isset($this->gatheredDetails['pickUpLibrary']) && $this->gatheredDetails['pickUpLibrary'] !== "") {
+ $selected = $this->gatheredDetails['pickUpLibrary'];
+ } else {
+ $selected = false;
+ }
+ ?>
+ <? foreach ($this->pickupLibraries as $lib): ?>
+ <option value="<?=$this->escapeHtmlAttr($lib['id'])?>"<?=(($selected === false && isset($lib['isDefault']) && $lib['isDefault']) || $selected === $lib['id']) ? ' selected="selected"' : ''?>>
+ <?=$this->transEsc('library_' . $lib['name'], null, $lib['name'])?>
+ </option>
+ <? endforeach; ?>
+ </select>
+ <? else: ?>
+ <? $lib = $this->pickupLibraries[0]; ?>
+ <input type="text" class="form-control" size="40" readonly="readonly" value="<?=$this->escapeHtmlAttr($this->translate('library_' . $lib['name'], null, $lib['name']))?>" />
+ <input type="hidden" id="pickupLibrary" name="gatheredDetails[pickUpLibrary]" value="<?=$this->escapeHtmlAttr($lib['id'])?>" />
+ <? endif; ?>
</div>
- <? endif; ?>
</div>
<? endif; ?>
--
GitLab