dcms3 install fixes and enable restrict #4949

IQSS · Dec 13, 2018 · bf31f9e · bf31f9e
1 parent 5537175
commit bf31f9e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/conf/docker-aio/c7.dockerfile b/conf/docker-aio/c7.dockerfile
@@ -3,7 +3,7 @@ FROM centos:7
 RUN yum install -y https://download.postgresql.org/pub/repos/yum/9.6/redhat/rhel-7-x86_64/pgdg-centos96-9.6-3.noarch.rpm
 #RUN yum install -y java-1.8.0-openjdk-headless postgresql-server sudo epel-release unzip perl curl httpd
 RUN yum install -y java-1.8.0-openjdk-devel postgresql96-server sudo epel-release unzip perl curl httpd
-RUN yum install -y jq lsof
+RUN yum install -y jq lsof awscli
 
 # copy and unpack dependencies (solr, glassfish)
 COPY dv /tmp/dv

diff --git a/conf/docker-dcm/0prep.sh b/conf/docker-dcm/0prep.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-wget https://github.com/sbgrid/data-capture-module/releases/download/0.3/dcm-0.5-0.noarch.rpm
+wget https://github.com/sbgrid/data-capture-module/releases/download/0.5/dcm-0.5-0.noarch.rpm
diff --git a/doc/sphinx-guides/source/developers/big-data-support.rst b/doc/sphinx-guides/source/developers/big-data-support.rst
@@ -165,7 +165,7 @@ Optional steps for setting up the S3 Docker DCM Variant
       - ``aws_access_key_id =``
       - ``aws_secret_access_key =``
 
-    - ALSO: ``nano ~/.aws/config`` to create a region file. Add these contents:
+    - Also: ``nano ~/.aws/config`` to create a region file. Add these contents:
 
       - ``[default]``
       - ``region = us-east-1``

diff --git a/src/main/webapp/filesFragment.xhtml b/src/main/webapp/filesFragment.xhtml
@@ -258,8 +258,9 @@
                                     <h:outputText value="#{bundle['file.metadata']}"/>
                                 </p:commandLink>
                             </li>
-                            <ui:fragment rendered="#{!settingsWrapper.publicInstall and !DatasetPage.workingVersion.hasPackageFile }">
-                                <li class="#{DatasetPage.lockedFromEdits ? 'disabled' : ''}">
+                            <!--no restrict on non-s3 package file -->
+                            <ui:fragment rendered="#{!settingsWrapper.publicInstall and (!DatasetPage.workingVersion.hasPackageFile or DatasetPage.workingVersion.getDataset().getStorageIdentifier().startsWith('s3://')) }">
+                                <li class="#{DatasetPage.lockedFromEdits ? 'disabled' : ''}"> 
                                     <p:commandLink oncomplete="toggle_dropdown();" 
                                                    onclick="testFilesSelectedForRestriction()">
                                         <h:outputText value="#{bundle['file.restrict']}"/>