Merge branch '2024.11'

tine-groupware · Feb 5, 2025 · 44b217d · 44b217d
2 parents 858893f + b25e5ba
commit 44b217d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/scripts/ansible/roles/tinedockercompose/defaults/main.yml b/scripts/ansible/roles/tinedockercompose/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-tinedockercompose_tine_image: "tinegroupware/tine:2023"
+tinedockercompose_tine_image: "tinegroupware/tine:2024"
 tinedockercompose_tinesetupuser: "tinesetup"
 tinedockercompose_tinesetuppw: "movemetovault"
 tinedockercompose_tinesetuphtpasswd: "setup:$$apr1$$JhCtViTh$$k15DH.HvNR5hZ66Ew5aTH/" #setuppw

diff --git a/tine20/Addressbook/js/MailinglistPanel.js b/tine20/Addressbook/js/MailinglistPanel.js
@@ -136,6 +136,10 @@ Tine.Addressbook.MailinglistPanel = Ext.extend(Ext.Panel, {
         this.isMailinglistCheckbox.checked = this.isMailingList;
         const sieveReplyTo = record?.data?.xprops?.sieveReplyTo ?? 'sender';
         const sieveReplyToEmail = record?.data?.email;
+
+        this.replyToComboBox.setValue(sieveReplyTo);
+        this.emailField.setValue(sieveReplyToEmail);
+        this.emailField.value = sieveReplyToEmail;
 
         Object.entries(this.checkboxes).forEach(([key, checkbox]) => {
             checkbox.checked = _.get(record, 'data.xprops.' + key, false);
@@ -149,10 +153,6 @@ Tine.Addressbook.MailinglistPanel = Ext.extend(Ext.Panel, {
 
             this.onMailinglistCheck(null, this.isMailingList);
             this.setReadOnly(!hasRequiredGrant || !hasRight);
-
-            this.replyToComboBox.setValue(sieveReplyTo);
-            this.emailField.setValue(sieveReplyToEmail);
-            this.emailField.value = sieveReplyToEmail;
         });
     },