Merge branch '2024.11'

tine-groupware · Jan 31, 2025 · 322c253 · 322c253
2 parents 84d0a7e + 7c71203
commit 322c253
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/tine20/Admin/js/user/EditDialog.js b/tine20/Admin/js/user/EditDialog.js
@@ -1249,7 +1249,7 @@ Tine.Admin.UserEditDialog = Ext.extend(Tine.widgets.dialog.EditDialog, {
 
     suggestNameBasedProps: function(field, e) {
         // suggest for new users only!
-        if (!this.record.id) {
+        if (this.record.phantom) {
             // accountFullName (cn im AD) + accountDisplayName(displayname im AD) + accountLoginName + accountEmailAddress
             Object.keys(Tine.Tinebase.configManager.get('accountTwig')).asyncForEach(async (fieldName) => {
                 if (fieldName === 'accountEmailAddress' && ! Tine.Tinebase.registry.get('primarydomain')) {

diff --git a/tine20/Tinebase/js/twingEnv.es6.js b/tine20/Tinebase/js/twingEnv.es6.js
@@ -184,6 +184,10 @@ const getTwingEnv = function () {
       return Promise.resolve(transliterate(string))
     }))
 
+    twingEnv.addFilter(new TwingFilter('accountLoginChars', function (str) {
+      return Promise.resolve(String(str).replace(/[^\w\-_.@\d+]/u, ''))
+    }))
+
     twingEnv.addFunction(new TwingFunction('keyField', function (appName, keyFieldName, id) {
       return Promise.resolve(Tine.Tinebase.widgets.keyfield.Renderer.render(appName, keyFieldName, id, 'text'))
     }))