Merge branch '2024.11'

tine-groupware · Feb 6, 2025 · 95235f6 · 95235f6
2 parents 432812c + a76a602
commit 95235f6
Show file tree

Hide file tree

Showing 4 changed files with 667 additions and 268 deletions.
diff --git a/tine20/Courses/js/CourseEditDialog.js b/tine20/Courses/js/CourseEditDialog.js
@@ -361,7 +361,7 @@ Tine.Courses.CourseEditDialog = Ext.extend(Tine.widgets.dialog.EditDialog, {
         });
         passwordDialog.openWindow();
 
-        passwordDialog.on('apply', function (password) {
+        passwordDialog.on('apply',  (password) => {
             this.loadMask.show();
             const accountObject = this.membersGrid.getSelectionModel().getSelected().data;
             Tine.Courses.resetPassword(accountObject.id, password, true).finally(() => {

diff --git a/tine20/Courses/js/Models.js b/tine20/Courses/js/Models.js
@@ -47,7 +47,8 @@ Tine.Courses.Model.Course = Tine.Tinebase.data.Record.create(Tine.Courses.Model.
 
 Tine.Courses.Model.Course.getDefaultData = function() {
     return {
-        type: Tine.Courses.registry.get('defaultType')
+        type: Tine.Courses.registry.get('defaultType'),
+        fileserver: 0,
     };
 };
 

diff --git a/tine20/Tinebase/js/widgets/form/RecordPickerComboBox.js b/tine20/Tinebase/js/widgets/form/RecordPickerComboBox.js
@@ -167,6 +167,11 @@ Tine.Tinebase.widgets.form.RecordPickerComboBox = Ext.extend(Ext.ux.form.Clearab
         this.emptyText = _.isString(this.emptyText) ? this.emptyText :
             (this.readOnly || this.disabled ? '' : String.format(i18n._('Search for {0} ...'), this.recordClass.getRecordName() || _('Record')));
 
+        this.listEmptyText = formatMessage('{recordGender, select, male {No matching {recordsName} found} female {No matching {recordsName} found} other {No matching {recordsName} found}}', {
+            recordGender: this.recordClass.getRecordGender(),
+            recordsName: this.recordClass.getRecordsName()
+        });
+
         this.loadingText = i18n._('Searching...');
 
         this.sortBy = this.sortBy || this.recordClass.getModelConfiguration()?.defaultSortInfo?.field;