From b123d05c9650c4caa58c722c0750d2396134f4d4 Mon Sep 17 00:00:00 2001
From: Claas Kazzer <kazzer@ub.uni-leipzig.de>
Date: Fri, 25 May 2018 16:23:20 +0200
Subject: [PATCH] refs #13257 * changes language references in
recordDataFormatterFactory * introduces new data-transEscCommaSep.phtml
---
.../View/Helper/Root/RecordDataFormatterFactory.php | 12 ++++++------
.../SolrDefault/data-transEscCommaSep.phtml | 7 +++++++
2 files changed, 13 insertions(+), 6 deletions(-)
create mode 100644 themes/finc/templates/RecordDriver/SolrDefault/data-transEscCommaSep.phtml
diff --git a/module/finc/src/finc/View/Helper/Root/RecordDataFormatterFactory.php b/module/finc/src/finc/View/Helper/Root/RecordDataFormatterFactory.php
index f032a410faf..2e4e20f781f 100644
--- a/module/finc/src/finc/View/Helper/Root/RecordDataFormatterFactory.php
+++ b/module/finc/src/finc/View/Helper/Root/RecordDataFormatterFactory.php
@@ -114,7 +114,7 @@ class RecordDataFormatterFactory
['helperMethod' => 'getFormatList']
);
$spec->setTemplateLine(
- 'Language', 'getLanguages', 'data-escapeHtml.phtml'
+ 'Language', 'getLanguages', 'data-transEscCommaSep.phtml'
);
$spec->setTemplateLine(
'Published',
@@ -216,7 +216,7 @@ class RecordDataFormatterFactory
['helperMethod' => 'getFormatList']
);
$spec->setTemplateLine(
- 'Language', 'getLanguages', 'data-escapeHtml.phtml'
+ 'Language', 'getLanguages', 'data-transEscCommaSep.phtml'
);
$spec->setTemplateLine(
'Additionals',
@@ -252,7 +252,7 @@ class RecordDataFormatterFactory
]
);
$spec->setTemplateLine(
- 'Language', 'getLanguages', 'data-escapeHtml.phtml'
+ 'Language', 'getLanguages', 'data-transEscCommaSep.phtml'
);
$spec->setLine(
'Format', 'getFormats', 'RecordHelper',
@@ -318,7 +318,7 @@ class RecordDataFormatterFactory
['helperMethod' => 'getFormatList']
);
$spec->setTemplateLine(
- 'Language', 'getLanguages', 'data-escapeHtml.phtml'
+ 'Language', 'getLanguages', 'data-transEscCommaSep.phtml'
);
$spec->setTemplateLine(
'Published',
@@ -610,7 +610,7 @@ class RecordDataFormatterFactory
);
// , context: "recordEvents"
$spec->setTemplateLine(
- 'Language', 'getLanguages','data-escapeHtml.phtml'
+ 'Language', 'getLanguages','data-transEscCommaSep.phtml'
);
$spec->setTemplateLine(
'Time of origin', 'getDateSpan', 'data-dateSpan.phtml'
@@ -701,7 +701,7 @@ class RecordDataFormatterFactory
['helperMethod' => 'getFormatList']
);
$spec->setTemplateLine(
- 'Language', 'getLanguages', 'data-escapeHtml.phtml'
+ 'Language', 'getLanguages', 'data-transEscCommaSep.phtml'
);
$spec->setTemplateLine(
'Published',
diff --git a/themes/finc/templates/RecordDriver/SolrDefault/data-transEscCommaSep.phtml b/themes/finc/templates/RecordDriver/SolrDefault/data-transEscCommaSep.phtml
new file mode 100644
index 00000000000..4e9dd72fe3e
--- /dev/null
+++ b/themes/finc/templates/RecordDriver/SolrDefault/data-transEscCommaSep.phtml
@@ -0,0 +1,7 @@
+<?if (!empty($data)): ?>
+ <? if(is_array($data)): ?>
+ <?=implode(', ', array_map(array($this, 'transEsc'), $data)); ?>
+ <? else: ?>
+ <?= $this->transEsc($data) ?>
+ <? endif; ?>
+<? endif; ?>
\ No newline at end of file
--
GitLab