Merge branch 'pu/cf/rt/243811' into 'main'

tweak(Addressbook/List): email cannot empyt See merge request tine20/tine20!6216
tine-groupware · Nov 13, 2024 · 7fb489d · 7fb489d
2 parents c933bfd + cf353c4
commit 7fb489d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/tine20/Addressbook/js/ListEditDialog.js b/tine20/Addressbook/js/ListEditDialog.js
@@ -92,7 +92,7 @@ Tine.Addressbook.ListEditDialog = Ext.extend(Tine.widgets.dialog.EditDialog, {
                                 fieldLabel: this.app.i18n._('E-Mail'),
                                 name: 'email',
                                 maxLength: 255,
-                                allowBlank: true,
+                                allowBlank: false,
                                 checkState: function (editDialog, field) {
                                     if (editDialog?.mailingListPanel) {
                                         const checked = editDialog.mailingListPanel.isMailinglistCheckbox.checked;
@@ -103,6 +103,9 @@ Tine.Addressbook.ListEditDialog = Ext.extend(Tine.widgets.dialog.EditDialog, {
                                     }
                                 },
                                 validator: function (value) {
+                                    if(!value) {
+                                        return false;
+                                    }
                                     return Tine.Tinebase.common.checkEmailDomain(value);
                                 },
                                 disabled: ! Tine.Tinebase.common.hasRight('manage_list_email_options', 'Addressbook'),

diff --git a/tine20/Addressbook/js/MailinglistPanel.js b/tine20/Addressbook/js/MailinglistPanel.js
@@ -50,6 +50,7 @@ Tine.Addressbook.MailinglistPanel = Ext.extend(Ext.Panel, {
             name: 'email',
             maxLength: 128,
             disabled: ! Tine.Tinebase.common.hasRight('manage_list_email_options', 'Addressbook'),
+            allowBlank: false,
             checkState: function (editDialog, record) {
                 this.validate();
             },