Merge pull request #5077 from IQSS/5052-fix-explore-button-render

#5052 Fix Display of Explore Button
IQSS · Sep 27, 2018 · b5da05e · b5da05e
2 parents bdedf46 + 423e372
commit b5da05e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/webapp/file-download-button-fragment.xhtml b/src/main/webapp/file-download-button-fragment.xhtml
@@ -51,12 +51,12 @@
     <!--exploreTools is set as a ui:param by the file and dataset pages-->
     <!--Note that "WorldMap Explore" is not an explore tool (external tool)-->
     <div class="btn-group" jsf:rendered="#{fileDownloadHelper.canDownloadFile(fileMetadata) and not empty exploreTools or (worldMapPermissionHelper.canUserSeeExploreWorldMapButtonFromPage(fileMetadata))}">
-        <ui:fragment rendered="#{exploreTools.size()==1}">
+        <ui:fragment rendered="#{(exploreTools.size()==1 and !worldMapPermissionHelper.canUserSeeExploreWorldMapButtonFromPage(fileMetadata))  or (exploreTools.size()==0 and worldMapPermissionHelper.canUserSeeExploreWorldMapButtonFromPage(fileMetadata))}">
             <button type="button" class="btn btn-default"  onclick="$(this).parent().find( 'li > a' ).trigger( 'click' );">
                 <span class="glyphicon glyphicon-equalizer"/> #{bundle.explore}
             </button>
         </ui:fragment>
-        <ui:fragment rendered="#{exploreTools.size()>1}">
+        <ui:fragment rendered="#{exploreTools.size()>1 or (exploreTools.size()>=1 and worldMapPermissionHelper.canUserSeeExploreWorldMapButtonFromPage(fileMetadata))}">
             <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
                 <span class="glyphicon glyphicon-equalizer"/> #{bundle.explore} <span  class="caret"/>
             </button>