From a760bb2bd7cfb56d4e9cf98dba9a976f0474834f Mon Sep 17 00:00:00 2001
From: paulboon <paul.boon@dans.knaw.nl>
Date: Wed, 27 Mar 2024 19:51:08 +0100
Subject: [PATCH] Fixing file publication date metadata field display

---
 src/main/webapp/file.xhtml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
index 2e15b1a52a5..07f70d68dfb 100644
--- a/src/main/webapp/file.xhtml
+++ b/src/main/webapp/file.xhtml
@@ -553,11 +553,16 @@
                                                         <td>#{FilePage.file.publicationDateFormattedYYYYMMDD}
                                                         </td>
                                                     </tr>
-                                                    <tr id="fileEPublicationDateBlock" jsf:rendered="#{!(empty FilePage.file.embargo)}">
+                                                    <tr id="fileEPublicationDateBlock" jsf:rendered="#{FilePage.file.released or !(empty FilePage.file.embargo) or !(empty FilePage.file.retention)}">
                                                         <th scope="row">
-                                                            #{bundle['file.metadataTab.fileMetadata.embargoDate.label']}
+                                                            #{bundle['file.metadataTab.fileMetadata.publicationDate.label']}
                                                         </th>
-                                                        <td>#{!(empty FilePage.file.embargo) ? FilePage.embargoPhrase: ''} #{!(empty FilePage.file.embargo) ? FilePage.file.embargo.dateAvailable : FilePage.file.publicationDateFormattedYYYYMMDD}
+                                                        <td>#{!(empty FilePage.file.embargo) ? FilePage.embargoPhrase: ''} #{!(empty FilePage.file.embargo) ? FilePage.file.embargo.dateAvailable : ''}
+                                                            #{!(empty FilePage.file.embargo) and !(empty FilePage.file.retention) ? '; ': ''}
+                                                            #{!(empty FilePage.file.retention) ? FilePage.retentionPhrase: ''} #{!(empty FilePage.file.retention) ? FilePage.file.retention.dateUnavailable: ''}
+                                                            #{!(empty FilePage.file.retention) ? ', ': ''}
+                                                            #{!(empty FilePage.file.retention) ? bundle['retention.enddateinfo']: ''}
+                                                            #{(empty FilePage.file.embargo and empty FilePage.file.retention)? FilePage.file.publicationDateFormattedYYYYMMDD : ''}
                                                         </td>
                                                     </tr>
                                                     <tr id="fileEmbargoBlock" jsf:rendered="#{!(empty FilePage.file.embargo) and ! (empty FilePage.file.embargo.reason)}">
@@ -567,13 +572,6 @@
                                                         <td>#{FilePage.file.embargo.reason}
                                                         </td>
                                                     </tr>
-                                                    <tr id="fileRPublicationDateBlock" jsf:rendered="#{!(empty FilePage.file.retention)}">
-                                                        <th scope="row">
-                                                            #{bundle['file.metadataTab.fileMetadata.retentionDate.label']}
-                                                        </th>
-                                                        <td>#{!(empty FilePage.file.retention) ? FilePage.retentionPhrase: ''} #{!(empty FilePage.file.retention) ? FilePage.file.retention.dateUnavailable : FilePage.file.publicationDateFormattedYYYYMMDD}, #{bundle['retention.enddateinfo']}
-                                                        </td>
-                                                    </tr>
                                                     <tr id="fileRetentionBlock" jsf:rendered="#{!(empty FilePage.file.retention) and ! (empty FilePage.file.retention.reason)}">
                                                         <th scope="row">
                                                             #{bundle['file.metadataTab.fileMetadata.retentionReason.label']}