Merge branch '2023.11' into 2024.11

tine-groupware · Jan 11, 2024 · e95c7ae · e95c7ae
2 parents c2d5f79 + c4f8cca
commit e95c7ae
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/tine20/Felamimail/js/AccountEditDialog.js b/tine20/Felamimail/js/AccountEditDialog.js
@@ -214,6 +214,13 @@ Tine.Felamimail.AccountEditDialog = Ext.extend(Tine.widgets.dialog.EditDialog, {
                 case 'save_sent_mail_to_source':
                     item.setDisabled(this.record.get('message_sent_copy_behavior') === 'skip');
                     break;
+                case 'name':
+                    item.setDisabled(! this.asAdminModule && (
+                        this.record.get('type') === 'shared'
+                        || this.record.get('type') === 'adblist'
+                        || ! this.hasEditAccountRight
+                    ));
+                    break;
                 default:
                     item.setDisabled(! this.asAdminModule && (this.isSystemAccount() || ! this.hasEditAccountRight));
             }

diff --git a/tine20/composer.json b/tine20/composer.json
@@ -62,7 +62,7 @@
     },
     {
       "type": "git",
-      "url": "https://github.com/tine20/zendframework1.git"
+      "url": "https://github.com/tine-groupware/zendframework1.git"
     },
     {
       "type": "git",