From d2878df72bae837a760ca3f4ea29575837d01420 Mon Sep 17 00:00:00 2001
From: Danae Komitopoulou <komitop.d@gmail.com>
Date: Tue, 21 Jan 2020 16:08:28 +0200
Subject: [PATCH] Filetype and subcategory are now displayed in dataset.xhtml
 (komitop.d/dataverse#14)

---
 src/main/webapp/filesFragment.xhtml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/filesFragment.xhtml b/src/main/webapp/filesFragment.xhtml
index aefdf245693..c147b05d104 100644
--- a/src/main/webapp/filesFragment.xhtml
+++ b/src/main/webapp/filesFragment.xhtml
@@ -429,7 +429,12 @@
                             <f:param value="#{DatasetPage.getGuestbookResponseCount(fileMetadata)}"/>
                         </h:outputFormat>
 
-                        <div class="checksum-block" style="word-break: break-all;" jsf:rendered="#{!fileMetadata.dataFile.tabularData}">
+                        <div class="fileType" jsf:rendered="#{!(empty fileMetadata.fileType)}">
+                            <h:outputText id="fileTypeNonEmpty" value="#{fileMetadata.fileType}" rendered="#{!(DatasetPage.editMode == 'FILE' or DatasetPage.editMode == 'CREATE') and !(empty fileMetadata.fileType)}"/>
+                            <h:outputText id="fileTypeSubcategoryNonEmpty" value=".#{fileMetadata.fileTypeSubcategory}" rendered="#{(!empty fileMetadata.fileTypeSubcategory) and (!(DatasetPage.editMode == 'FILE' or DatasetPage.editMode == 'CREATE') and !(empty fileMetadata.fileType))}"/>
+                        </div>
+
+                        <div class="checksum-block" style="word-break: break-all;" jsf:rendered="#{!fileMetadata.dataFile.tabularData and (empty fileMetadata.fileType)}">
                             <h:outputText id="file-checksum" value="#{fileMetadata.dataFile.checksumType}: #{fileMetadata.dataFile.checksumValue}" rendered="#{!(empty fileMetadata.dataFile.checksumValue) and ((DatasetPage.editMode != 'FILE' and DatasetPage.editMode != 'CREATE') or !DatasetPage.isDuplicate(fileMetadata))}"/>
                         </div>
                     </div>