Merge pull request #2 from IQSS/2437-handle-support-iqss

update from 2437 handle support iqss
IQSS · May 3, 2017 · 2650344 · 2650344
2 parents c2f2076 + b6d9382
commit 2650344
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/scripts/installer/install b/scripts/installer/install
@@ -161,7 +161,8 @@ my %POSTGRES_DRIVERS = (
     "9_2", "postgresql-9.1-902.jdbc4.jar",
     "9_3", "postgresql-9.1-902.jdbc4.jar",
     "9_4", "postgresql-9.1-902.jdbc4.jar",
-    "9_5", "postgresql-9.1-902.jdbc4.jar"
+    "9_5", "postgresql-9.1-902.jdbc4.jar",
+    "9_6", "postgresql-9.1-902.jdbc4.jar"
 );
 
 # A few preliminary checks:

diff --git a/src/main/webapp/file-download-button-fragment.xhtml b/src/main/webapp/file-download-button-fragment.xhtml
@@ -275,4 +275,14 @@
         <!-- 4.2.1 - TODO: retest this on a dataset with fileRequest enabled and with some files restricted to the user -->
         <span class="glyphicon glyphicon-bullhorn"/> #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? bundle['file.accessRequested'] : bundle['file.requestAccess']}
     </p:commandLink>
+    <p:dialog header="#{bundle['file.mapData.unpublished.header']}" widgetVar="mapData_popup" modal="true">
+        <p class="help-block">
+            <span class="text-danger"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['file.mapData.unpublished.message']}</span>
+        </p>
+        <div class="button-block">
+            <button type="button" class="btn btn-default" onclick="PF('mapData_popup').hide();PF('blockDatasetForm').hide();">
+                                #{bundle.close}
+            </button>
+        </div>
+    </p:dialog>
 </ui:composition>