avoid jsf:render in button

IQSS · Oct 18, 2018 · ed5999b · ed5999b
1 parent fc8b745
commit ed5999b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
@@ -330,12 +330,11 @@
                                         <h:outputText id="fileTypeOutputTabular" value="#{bundle['file.type.tabularData']}" rendered="#{FilePage.fileMetadata.dataFile.tabularData}"/>
                                         <h:outputText id="fileSize" value=" - #{FilePage.fileMetadata.dataFile.friendlySize}" />
                                         <h:outputText id="fileCreatePublishDate" value=" - #{bundle['file.lastupdated.label']}: #{FilePage.fileMetadata.fileDateToDisplay}" rendered="#{!(empty FilePage.fileMetadata.id)}"/>
-                                        <div class="checksum-block" jsf:rendered="#{!FilePage.file.tabularData}">
+                                        <div class="checksum-block" jsf:rendered="#{!FilePage.file.tabularData and !(empty FilePage.file.checksumValue)}">
                                         <button class="btn btn-secondary checksum" type="button"
                                             data-clipboard-action="copy"
                                             data-clipboard-text="#{FilePage.file.checksumValue}"
-                                            title="#{bundle['file.checksum.copy']} #{FilePage.file.checksumValue}"
-                                            jsf:rendered="#{!(empty FilePage.file.checksumValue)}">
+                                            title="#{bundle['file.checksum.copy']} #{FilePage.file.checksumValue}">
                                             #{FilePage.file.tabularData ? FilePage.file.originalChecksumType : FilePage.file.checksumType} 
                                             <span class="glyphicon glyphicon-copy"></span>
                                         </button>

diff --git a/src/main/webapp/filesFragment.xhtml b/src/main/webapp/filesFragment.xhtml
@@ -206,8 +206,8 @@
                     <f:param value="#{DatasetPage.getGuestbookResponseCount(fileMetadata)}"/>
                 </h:outputFormat>
 
-                <div class="checksum-block" jsf:rendered="#{!fileMetadata.dataFile.tabularData}">
-                     <button class="btn btn-secondary checksum" type="button" data-clipboard-action="copy" data-clipboard-text="#{fileMetadata.dataFile.checksumValue}" title="#{bundle['file.checksum.copy']} #{fileMetadata.dataFile.checksumValue}"  jsf:rendered="#{!(empty fileMetadata.dataFile.checksumValue) and ((DatasetPage.editMode != 'FILE' and DatasetPage.editMode != 'CREATE') or !DatasetPage.isDuplicate(fileMetadata))}">
+                <div class="checksum-block" jsf:rendered="#{!fileMetadata.dataFile.tabularData and !(empty fileMetadata.dataFile.checksumValue) and ((DatasetPage.editMode != 'FILE' and DatasetPage.editMode != 'CREATE') or !DatasetPage.isDuplicate(fileMetadata))}">
+                     <button class="btn checksum" type="button" data-clipboard-action="copy" data-clipboard-text="#{fileMetadata.dataFile.checksumValue}" title="#{bundle['file.checksum.copy']} #{fileMetadata.dataFile.checksumValue}">
                             #{fileMetadata.dataFile.checksumType}
                         <span class="glyphicon glyphicon-copy"></span>
                     </button>