Merge pull request #47 from SBU-BMI/develop

Develop
SBU-BMI · Nov 12, 2019 · ce86ee9 · ce86ee9
2 parents 1fa1179 + d91bdd4
commit ce86ee9
Show file tree

Hide file tree

Showing 10 changed files with 343 additions and 53 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -51,8 +51,12 @@ RUN openssl req -subj '/CN=www.mydom.com/O=My Company Name LTD./C=US' -x509 -nod
 EXPOSE 80
 COPY run.sh /root/run.sh
 COPY mysql.tgz /build
-RUN mkdir /quip/pathdbconfig
-COPY config/* /quip/pathdbconfig/
+RUN mkdir /quip/config
+RUN mkdir /quip/config-update
+COPY config/* /quip/config/
+COPY config/* /quip/config-update/
+# remove local exceptions to updates
+RUN rm /quip/config-update/tac_lite.settings.yml
 COPY content/* /quip/content/
 # download caMicroscope
 WORKDIR /quip/web

diff --git a/config/views.view.collections.yml b/config/views.view.collections.yml
@@ -4,6 +4,7 @@ status: true
 dependencies:
   config:
     - taxonomy.vocabulary.collections
+    - user.role.authenticated
   module:
     - ds
     - rest
@@ -26,9 +27,10 @@ display:
     position: 0
     display_options:
       access:
-        type: perm
+        type: role
         options:
-          perm: 'access content'
+          role:
+            authenticated: authenticated
       cache:
         type: tag
         options: {  }
@@ -357,7 +359,7 @@ display:
         - 'languages:language_content'
         - 'languages:language_interface'
         - url.query_args
-        - user.permissions
+        - user.roles
       tags: {  }
   page_1:
     display_plugin: page
@@ -373,7 +375,7 @@ display:
         - 'languages:language_content'
         - 'languages:language_interface'
         - url.query_args
-        - user.permissions
+        - user.roles
       tags: {  }
   rest_export_1:
     display_plugin: rest_export
@@ -397,5 +399,5 @@ display:
         - 'languages:language_content'
         - 'languages:language_interface'
         - request_format
-        - user.permissions
+        - user.roles
       tags: {  }
diff --git a/config/views.view.download.yml b/config/views.view.download.yml
@@ -10,6 +10,7 @@ dependencies:
     - field.storage.node.imageid
     - field.storage.node.studyid
     - node.type.wsi
+    - user.role.authenticated
   module:
     - csv_serialization
     - file
@@ -36,9 +37,10 @@ display:
     position: 0
     display_options:
       access:
-        type: perm
+        type: role
         options:
-          perm: 'access content'
+          role:
+            authenticated: authenticated
       cache:
         type: tag
         options: {  }
@@ -580,7 +582,7 @@ display:
         - 'languages:language_interface'
         - url
         - 'user.node_grants:view'
-        - user.permissions
+        - user.roles
       tags:
         - 'config:field.storage.node.clinicaltrialsubjectid'
         - 'config:field.storage.node.field_iip_path'
@@ -1012,7 +1014,7 @@ display:
         - request_format
         - url
         - 'user.node_grants:view'
-        - user.permissions
+        - user.roles
       tags:
         - 'config:field.storage.node.clinicaltrialsubjectid'
         - 'config:field.storage.node.field_iip_path'
@@ -1114,7 +1116,7 @@ display:
         - request_format
         - url
         - 'user.node_grants:view'
-        - user.permissions
+        - user.roles
       tags:
         - 'config:field.storage.node.clinicaltrialsubjectid'
         - 'config:field.storage.node.field_iip_path'
@@ -1137,7 +1139,7 @@ display:
         - 'languages:language_interface'
         - url
         - 'user.node_grants:view'
-        - user.permissions
+        - user.roles
       tags:
         - 'config:field.storage.node.clinicaltrialsubjectid'
         - 'config:field.storage.node.field_iip_path'

diff --git a/config/views.view.findfile.yml b/config/views.view.findfile.yml
@@ -10,6 +10,7 @@ dependencies:
     - field.storage.node.imageid
     - field.storage.node.studyid
     - node.type.wsi
+    - user.role.authenticated
   module:
     - node
     - rest
@@ -32,9 +33,10 @@ display:
     position: 0
     display_options:
       access:
-        type: perm
+        type: role
         options:
-          perm: 'access content'
+          role:
+            authenticated: authenticated
       cache:
         type: tag
         options: {  }
@@ -572,7 +574,7 @@ display:
         - url
         - url.query_args
         - 'user.node_grants:view'
-        - user.permissions
+        - user.roles
       tags:
         - 'config:field.storage.node.clinicaltrialsubjectid'
         - 'config:field.storage.node.field_collection'
@@ -647,7 +649,7 @@ display:
         - request_format
         - url
         - 'user.node_grants:view'
-        - user.permissions
+        - user.roles
       tags:
         - 'config:field.storage.node.clinicaltrialsubjectid'
         - 'config:field.storage.node.field_collection'
@@ -671,7 +673,7 @@ display:
         - url
         - url.query_args
         - 'user.node_grants:view'
-        - user.permissions
+        - user.roles
       tags:
         - 'config:field.storage.node.clinicaltrialsubjectid'
         - 'config:field.storage.node.field_collection'

diff --git a/config/views.view.idmap.yml b/config/views.view.idmap.yml
@@ -8,6 +8,7 @@ dependencies:
     - field.storage.node.imageid
     - field.storage.node.studyid
     - node.type.wsi
+    - user.role.authenticated
   module:
     - node
     - rest
@@ -31,9 +32,10 @@ display:
     position: 0
     display_options:
       access:
-        type: perm
+        type: role
         options:
-          perm: 'access content'
+          role:
+            authenticated: authenticated
       cache:
         type: tag
         options: {  }
@@ -633,7 +635,7 @@ display:
         - url
         - url.query_args
         - 'user.node_grants:view'
-        - user.permissions
+        - user.roles
       tags:
         - 'config:field.storage.node.clinicaltrialsubjectid'
         - 'config:field.storage.node.field_collection'
@@ -711,7 +713,7 @@ display:
         - request_format
         - url
         - 'user.node_grants:view'
-        - user.permissions
+        - user.roles
       tags:
         - 'config:field.storage.node.clinicaltrialsubjectid'
         - 'config:field.storage.node.field_collection'
@@ -734,7 +736,7 @@ display:
         - url
         - url.query_args
         - 'user.node_grants:view'
-        - user.permissions
+        - user.roles
       tags:
         - 'config:field.storage.node.clinicaltrialsubjectid'
         - 'config:field.storage.node.field_collection'