Merge tag '2024.14' into develop

2024.14
City-of-Helsinki · Oct 24, 2024 · 8a44aed · 8a44aed
2 parents c3de5b4 + 4e0c8c3
commit 8a44aed
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,26 @@
 # CHANGELOG
 
+## 2024.14
+- 15cac2065 feat: UHF-10630: Update autologout (#1498)
+- bcb5965cf fix: UHF-10639: If hometown is not properly set, use - and log errors. (#1494)
+- e563549f0 Update configuration (#1497)
+- e40c9e132 Hotfix UHF-10750 - 2024.13.1
+- ac7621f99 UHF-10750: Add check for missing label text
+- b5538eb75 Update configuration (#1495)
+- 725fe14f7 Automatic update (#1507)
+- 3cba4c25a fix: UHF-10801:  Fix tests, both unit & regression (#1502)
+- 14c5c50b6 fix: UHF-10813: Hide edit button for application if saving process is not completed (#1508)
+- 13c5ba63b feat: UHF-10537: KUVA Erillisavustushakemus (#1484)
+- 34dc39afc fix: UHF-10813: Remove SUBMITTED status from editable list. (#1505)
+- 8b405d8cf Fix file deletion
+- 18192476b Automatic update (#1504)
+- 5c684a783 Merge branch 'develop' into release/2024.14
+- a63faa9bd fix: UHF-10736: Make sure that uploaded attachments are properly set to application data. (#1496)
+- 5773c2004 Update configuration (#1501)
+- 57648e948 Version + changelog
+- 927c79293 fix: UHF-10650: Uncomment the printing script to make printing button work again (#1512)
+- e2d0d519f fix: UHF-10142: Allow "Delete" button to show on RECEIVED applications when navigating on the form. (#1510)
+
 ## 2024.13
 - 9465ef688 Update configuration (#1492)
 - 9a2032b95 Fix error with missing label.

diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
     "homepage": "https://github.com/City-of-Helsinki/drupal-helfi-platform",
     "minimum-stability": "dev",
     "prefer-stable": true,
-    "version": "2024.13",
+    "version": "2024.14",
     "require": {
         "ext-json": "*",
         "composer/installers": "^1.9",

diff --git a/conf/cmi/language/en/webform.webform.kuva_projekti.yml b/conf/cmi/language/en/webform.webform.kuva_projekti.yml
@@ -199,6 +199,7 @@ elements: |
     '#title': 'Premise name'
   postinumero:
     '#title': 'Postal code'
+    '#pattern_error': 'Please enter a valid 5-digit postal code.'
   kyseessa_on_kaupungin_omistama_tila:
     '#title': 'City owns the property'
     '#options':

diff --git a/conf/cmi/language/sv/webform.webform.kuva_projekti.yml b/conf/cmi/language/sv/webform.webform.kuva_projekti.yml
@@ -202,6 +202,7 @@ elements: |
     '#title': Namn
   postinumero:
     '#title': Postnummer
+    '#pattern_error': 'Vänligen ange ett giltigt 5-siffrigt postnummer.'
   kyseessa_on_kaupungin_omistama_tila:
     '#title': 'Stadens eget utrymme'
     '#options':

diff --git a/conf/cmi/webform.webform.kasvatus_ja_koulutus_yleisavustu.yml b/conf/cmi/webform.webform.kasvatus_ja_koulutus_yleisavustu.yml
@@ -19,7 +19,7 @@ third_party_settings:
       48: '48'
     applicationTargetGroup: '21'
     applicationOpen: '2024-04-02T00:00:00'
-    applicationClose: '2024-10-04T16:00:00'
+    applicationClose: '2024-10-23T16:00:00'
     applicationContinuous: 0
     disableCopying: 0
     applicationActingYears:
@@ -29,6 +29,7 @@ third_party_settings:
     applicationActingYearsNextCount: ''
     status: released
     parent: ''
+    avus2BreakingChange: false
 weight: 0
 open: null
 close: null

diff --git a/conf/cmi/webform.webform.kuva_projekti.yml b/conf/cmi/webform.webform.kuva_projekti.yml
@@ -682,12 +682,13 @@ elements: |-
             class:
               - webform--large
         postinumero:
-          '#type': number
+          '#type': textfield
           '#title': Postinumero
           '#attributes':
             class:
               - webform--small
-          '#input_mask': '99999'
+          '#pattern': '^[0-9]{5}$'
+          '#pattern_error': 'Syötä 5 numeroinen postinumero.'
           '#required': true
         kyseessa_on_kaupungin_omistama_tila:
           '#type': radios

diff --git a/conf/cmi/webform.webform.taide_ja_kulttuuriavustukset_tai.yml b/conf/cmi/webform.webform.taide_ja_kulttuuriavustukset_tai.yml
@@ -17,7 +17,7 @@ third_party_settings:
       62: '62'
     applicationTargetGroup: '22'
     applicationOpen: '2024-06-05T08:26:00'
-    applicationClose: '2024-09-26T16:02:00'
+    applicationClose: '2024-10-12T10:00:00'
     applicationContinuous: 0
     disableCopying: 1
     applicationActingYearsType: next_x_years
@@ -28,6 +28,7 @@ third_party_settings:
     applicationActingYearsNextCount: '1'
     status: released
     parent: ''
+    avus2BreakingChange: false
 weight: 0
 open: null
 close: null

diff --git a/docker/openshift/crons/pubsub.sh b/docker/openshift/crons/pubsub.sh
@@ -1,15 +1,10 @@
 #!/bin/bash
 
-if [ -z "$DRUPAL_PUBSUB_VAULT" ]; then
-  echo "PubSub is not configured, exiting."
-  exit 0
-fi
+#echo "Running PubSub daemon: $(date +'%Y-%m-%dT%H:%M:%S%:z')"
 
-echo "Running PubSub daemon: $(date +'%Y-%m-%dT%H:%M:%S%:z')"
-
-while true
-do
+#while true
+#do
   # PubSub process exists with success return code after
   # certain number of messages and should then be restarted.
-  drush helfi:azure:pubsub-listen || exit 1
-done
+#  drush helfi:azure:pubsub-listen || exit 1
+#done