From 99ace1fc32ed04c7326367b46b64d50648396307 Mon Sep 17 00:00:00 2001
From: Dorian Merz <merz@ub.uni-leipzig.de>
Date: Fri, 17 Jul 2020 16:07:16 +0200
Subject: [PATCH] refs #18015 [master] code cleanup
* remove unnecessary (and error prone) function
* bugfix in data-titleUniform: avoids undefined index error
---
.../View/Helper/Root/MultiDataFieldsTrait.php | 24 -------------------
.../DefaultRecord/data-titleUniform.phtml | 4 ++--
2 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/module/finc/src/finc/View/Helper/Root/MultiDataFieldsTrait.php b/module/finc/src/finc/View/Helper/Root/MultiDataFieldsTrait.php
index 6c8b3ec0f5e..be5bd3f42ad 100644
--- a/module/finc/src/finc/View/Helper/Root/MultiDataFieldsTrait.php
+++ b/module/finc/src/finc/View/Helper/Root/MultiDataFieldsTrait.php
@@ -82,30 +82,6 @@ trait MultiDataFieldsTrait
return $final;
}
- /**
- * return render details for titleUniform data set
- * @return callback
- */
- public function titleUniform($data, $options, $driver)
- {
- // Sort the data:
- $final = [];
- foreach ($data as $type => $values) {
- $final[] = [
- 'label' => $driver->tryMethod('isRDA')
- ? 'rda_original_title'
- : 'non_rda_original_title',
- 'values' => [$type => $values],
- 'options' => [
- 'pos' => $options['pos'],
- 'renderType' => 'RecordDriverTemplate',
- 'template' => 'data-titleUniform.phtml',
- ],
- ];
- }
- return $final;
- }
-
/**
* return render details for events data set
* @return callback
diff --git a/themes/finc/templates/RecordDriver/DefaultRecord/data-titleUniform.phtml b/themes/finc/templates/RecordDriver/DefaultRecord/data-titleUniform.phtml
index 65f1c152091..3ff56c5bf39 100644
--- a/themes/finc/templates/RecordDriver/DefaultRecord/data-titleUniform.phtml
+++ b/themes/finc/templates/RecordDriver/DefaultRecord/data-titleUniform.phtml
@@ -1,11 +1,11 @@
<!-- finc: RecordDriver - DefaultRecord - data-titleUniform -->
<?php if (!empty($data)): ?>
<?php if (is_array($data)): ?>
- <?php if ($data['titleUniform']): ?>
+ <?php if (isset($data['titleUniform'])): ?>
<a href="<?= $this->record($this->driver)->getLink('titleUniform', $data['titleUniform']) ?>">
<?php endif; ?>
<?= $this->escapeHtml($data['title']) ?>
- <?php if ($data['titleUniform']): ?>
+ <?php if (isset($data['titleUniform'])): ?>
</a>
<?php endif; ?>
<?php if (isset($data['lang'])): ?> ⟨<?= $this->escapeHtml($data['lang']) ?>⟩<?php endif; ?>
--
GitLab