Merge branch 'release/2020.04-01'

.ddev/config.yaml

@@ -15,15 +15,11 @@ additional_hostnames:
 - ski-wochenenden
 - schnee-event
 additional_fqdns: []
-nfs_mount_enabled: false
+nfs_mount_enabled: true
 provider: default
 omit_containers: [dba]
 use_dns_when_possible: true
 timezone: Europe/Berlin
-hooks:
-  post-start:
-    - exec: bash -c "sudo chown -R ${DDEV_UID}:${DDEV_GID} /var/www/html/vendor"
-    - exec: bash -c "sudo chown -R ${DDEV_UID}:${DDEV_GID} /var/www/html/var"
 
 # This config.yaml was created with ddev version v1.13.1
 # webimage: drud/ddev-webserver:v1.13.1

.ddev/docker-compose.env.yaml

@@ -3,22 +3,4 @@ version: '3.6'
 services:
   web:
     environment:
-      - TYPO3_CONTEXT=Development/Ddev
+      - TYPO3_CONTEXT=Development
-      - DDEV_UID
-      - DDEV_GID
-    volumes:
-      - type: volume
-        source: var
-        target: /var/www/html/var
-        volume:
-          nocopy: true
-      - type: volume
-        source: vendor
-        target: /var/www/html/vendor
-        volume:
-          nocopy: true
-volumes:
-  vendor:
-    driver: local
-  var:
-    driver: local

config/sites/ep-reisen/config.yaml

@@ -1,14 +1,11 @@
 base: /
 baseVariants:
   -
-    base: 'https://eptypo3.burn.dpn'
+    base: 'https://eptypo3.ddev.site'
     condition: 'applicationContext == "Development"'
   -
-    base: 'https://schnee-event.burn.dpn'
+    base: 'https://schnee-event.ddev.site'
     condition: 'applicationContext == "Development/Skimax"'
-  -
-    base: 'https://ep-reisen.ddev.site'
-    condition: 'applicationContext == "Development/Ddev"'
 disableStaticFileCache: true
 errorHandling:
   -
@@ -130,8 +127,8 @@ routeEnhancers:
       date_to:
         type: PassthroughMapper
     requirements:
-      product_uid: '\d'
+      product_uid: \d
-      hotel_uid: '\d'
+      hotel_uid: \d
       date_from: '\d{4}\-\d{2}\-\d{2}'
       date_to: '\d{4}\-\d{2}\-\d{2}'
   BookingLinkPlugin:

public/typo3conf/ext/ep_theme/Configuration/Forms/FormSetup.yaml

@@ -2,12 +2,8 @@ TYPO3:
   CMS:
     Form:
       persistenceManager:
-        allowedFileMounts:
-          10: '1:/user_upload/Formulare/'
         allowedExtensionPaths:
           10: EXT:ep_theme/Resources/Private/Forms/
-        allowSaveToExtensionPaths: false
-        allowDeleteFromExtensionPaths: false
 
       prototypes:
         standard:

public/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/Form.typoscript

@@ -7,3 +7,7 @@ plugin.tx_form.view {
 plugin.tx_form.settings.yamlConfigurations {
     100 = EXT:ep_theme/Configuration/Forms/FormSetup.yaml
 }
+
+module.tx_form.settings.yamlConfigurations {
+    100 = EXT:ep_theme/Configuration/Forms/FormSetup.yaml
+}