Merge pull request #106 from City-of-Helsinki/dev

Release 2022-11-30
City-of-Helsinki · Dec 1, 2022 · 8a9f11c · 8a9f11c
2 parents 06f94cd + 1f5845a
commit 8a9f11c
Show file tree

Hide file tree

Showing 8 changed files with 158 additions and 163 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
@@ -298,4 +298,5 @@ hidden:
   field_unit_type: true
   hide_description: true
   hide_sidebar_navigation: true
+  ontologyword_ids: true
   show_www: true
diff --git a/conf/cmi/field.storage.paragraph.field_list_of_links_design.yml b/conf/cmi/field.storage.paragraph.field_list_of_links_design.yml
@@ -19,9 +19,6 @@ settings:
     -
       value: without-image
       label: 'Without image'
-    -
-      value: without-image-desc
-      label: 'Without image and description'
   allowed_values_function: ''
 module: options
 locked: false

diff --git a/conf/cmi/language/fi/field.storage.paragraph.field_list_of_links_design.yml b/conf/cmi/language/fi/field.storage.paragraph.field_list_of_links_design.yml
@@ -4,5 +4,3 @@ settings:
       label: Kuvallinen
     -
       label: 'Ilman kuvaa'
-    -
-      label: 'Ilman kuvaa ja kuvausta'
diff --git a/conf/cmi/views.view.media_library.yml b/conf/cmi/views.view.media_library.yml
@@ -1072,6 +1072,27 @@ display:
           absolute: 0
           output_url_as_text: 0
           text: Edit
+      pager:
+        type: full
+        options:
+          offset: 0
+          items_per_page: 24
+          total_pages: null
+          id: 0
+          tags:
+            next: ››
+            previous: ‹‹
+            first: '« First'
+            last: 'Last »'
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '6, 12, 24, 48'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          quantity: 9
       access:
         type: perm
         options:
@@ -1275,27 +1296,6 @@ display:
       rendering_language: '***LANGUAGE_language_interface***'
       display_extenders: {  }
       path: admin/content/media-widget
-      pager:
-        type: full
-        options:
-          offset: 0
-          items_per_page: 24
-          total_pages: null
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-            first: '« First'
-            last: 'Last »'
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '6, 12, 24, 48'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-          quantity: 9
     cache_metadata:
       max-age: -1
       contexts:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -46,6 +46,7 @@ services:
   redis:
     container_name: "${COMPOSE_PROJECT_NAME}-redis"
     image: redis:7-alpine
+    command: [sh, -c, "rm -f /data/dump.rdb && redis-server --save ''"]
     networks:
       - internal
   db:

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -16,7 +16,7 @@
   <env name="DTT_MINK_DRIVER_ARGS" value='["chrome", {"chromeOptions":{"w3c": false }}, "http://127.0.0.1:4444"]'/>
   <env name="DTT_API_OPTIONS" value='{"socketTimeout": 360, "domWaitTimeout": 3600000}' />
   <env name="DTT_API_URL" value="http://127.0.0.1:9222"/>
-  <env name="DTT_BASE_URL" value="http://127.0.0.1:8888"/>
+  <env name="DTT_BASE_URL" value="http://127.0.0.1:8080"/>
 </php>
 <testsuites>
   <testsuite name="unit">

diff --git a/tools/make/project/install.mk b/tools/make/project/install.mk
@@ -31,8 +31,8 @@ PHONY += drush-locale-update
 drush-locale-update: ## Update translations.
 	$(call step,Update translations...)
 	$(call drush,state:set locale.translation_last_checked 0)
-	$(call drush_on_docker,locale:check)
-	$(call drush_on_docker,locale:update)
-	$(call drush_on_docker,cr)
+	$(call drush,locale:check)
+	$(call drush,locale:update)
+	$(call drush,cr)
 	$(call step,Import custom translations...)
 	$(call drush,helfi:locale-import helfi_platform_config)