Fix for WorldMapPermissionHelper.java and 'Map Data' not showing. [ref …

…#2465 @raprasad df05292]
IQSS · Nov 1, 2016 · 54f2740 · 54f2740
1 parent c0f63fa
commit 54f2740
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 9 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -964,9 +964,13 @@ private void loadTwoRavensHelper() {
      */
     private void loadWorldMapPermissionHelper() {
 
-        worldMapPermissionHelper = WorldMapPermissionHelper.getPermissionHelperForDatasetPage(settingsService, mapLayerMetadataService, dataset, session);
+        worldMapPermissionHelper = WorldMapPermissionHelper.getPermissionHelperForDatasetPage(settingsService, 
+                        mapLayerMetadataService, 
+                        dataset, 
+                        permissionService,
+                        session);
 
-    }
+}
 
 
 

diff --git a/src/main/java/edu/harvard/iq/dataverse/FilePage.java b/src/main/java/edu/harvard/iq/dataverse/FilePage.java
@@ -463,8 +463,11 @@ private void loadTwoRavensHelper() {
      */
     private void loadWorldMapPermissionHelper() {
 
-        worldMapPermissionHelper = WorldMapPermissionHelper.getPermissionHelperForDatasetPage(settingsService, mapLayerMetadataService, fileMetadata.getDataFile().getOwner(), session);
-
-    }
+        worldMapPermissionHelper = WorldMapPermissionHelper.getPermissionHelperForDatasetPage(settingsService, 
+                        mapLayerMetadataService, 
+                        fileMetadata.getDataFile().getOwner(), 
+                        permissionService,
+                        session);   
+}
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/datasetutility/WorldMapPermissionHelper.java b/src/main/java/edu/harvard/iq/dataverse/datasetutility/WorldMapPermissionHelper.java
@@ -89,14 +89,18 @@ public WorldMapPermissionHelper(SettingsServiceBean settingsService, MapLayerMet
      * @param settingsService
      * @param mapLayerMetadataService
      * @param dataset
+     * @param permissionService
      * @param session
      * @return 
      */
     public static WorldMapPermissionHelper getPermissionHelperForDatasetPage(
-                SettingsServiceBean settingsService, MapLayerMetadataServiceBean mapLayerMetadataService,
-                Dataset dataset, DataverseSession session){
+                    SettingsServiceBean settingsService, 
+                    MapLayerMetadataServiceBean mapLayerMetadataService,
+                    Dataset dataset,
+                    PermissionServiceBean permissionService,
+                    DataverseSession session){
 
-       return new WorldMapPermissionHelper(settingsService, mapLayerMetadataService, dataset, null, session);        
+       return new WorldMapPermissionHelper(settingsService, mapLayerMetadataService, dataset, permissionService, session);        
     }
 
     /**
@@ -517,25 +521,29 @@ private boolean canUserSeeMapDataButton(FileMetadata fm, boolean permissionsChec
 
         // This is only here as a reminder to the public method users 
         if (!permissionsChecked){
+
             return false;
         }
 
         //  (1) Is this file a Shapefile or a Tabular file tagged as Geospatial?
         //  TO DO:  EXPAND FOR TABULAR FILES TAGGED AS GEOSPATIAL!
         //
         if (!(this.isPotentiallyMappableFileType(fm))){
+
             return false;
         }
 
 
         //  (2) Is the view GeoconnectViewMaps 
         if (!settingsService.isTrueForKey(SettingsServiceBean.Key.GeoconnectCreateEditMaps, false)){
+
             return false;
         }
 
         //  (3) Is File released?
         //
         if (fm.getDataFile().isReleased()){
+
             return true;
         }
 

diff --git a/src/main/webapp/file-download-button-fragment.xhtml b/src/main/webapp/file-download-button-fragment.xhtml
@@ -88,7 +88,7 @@
                 <span class="glyphicon glyphicon-map-marker"/> #{bundle['file.mapData']}
             </h:outputLink>
             <!-- Unpublished Map Data -->
-            <ui:fragment rendered="#{worldMapPermissionHelper.canSeeMapButtonReminderToPublish(fileMetadata)}">
+            <ui:fragment rendered="#{worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(fileMetadata)}">
                 <button type="button" class="btn btn-default" onclick="PF('mapData_popup').show()">
                     <span class="glyphicon glyphicon-map-marker"/> #{bundle['file.mapData']}
                 </button>