diff --git a/CHANGELOG b/CHANGELOG index d4af93de40..8e07bdc4bc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ devel ----- +* UI: fixed issue #3822: disabled name input field for system collections + * fixed issue #3741: fix terminal color output in Windows * UI: using default user database api during database creation now diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/settingsView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/settingsView.js index 1d7bb3e7f8..e4633f728d 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/settingsView.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/settingsView.js @@ -228,30 +228,57 @@ var tableContent = []; if (!isCoordinator) { - tableContent.push( - window.modalView.createTextEntry( - 'change-collection-name', - 'Name', - this.model.get('name'), - false, - '', - true, - [ - { - rule: Joi.string().regex(/^[a-zA-Z]/), - msg: 'Collection name must always start with a letter.' - }, - { - rule: Joi.string().regex(/^[a-zA-Z0-9\-_]*$/), - msg: 'Only Symbols "_" and "-" are allowed.' - }, - { - rule: Joi.string().required(), - msg: 'No collection name given.' - } - ] - ) - ); + if (this.model.get('name').substr(0, 1) === '_') { + tableContent.push( + window.modalView.createReadOnlyEntry( + 'change-collection-name', + 'Name', + this.model.get('name'), + false, + '', + true, + [ + { + rule: Joi.string().regex(/^[a-zA-Z]/), + msg: 'Collection name must always start with a letter.' + }, + { + rule: Joi.string().regex(/^[a-zA-Z0-9\-_]*$/), + msg: 'Only Symbols "_" and "-" are allowed.' + }, + { + rule: Joi.string().required(), + msg: 'No collection name given.' + } + ] + ) + ); + } else { + tableContent.push( + window.modalView.createTextEntry( + 'change-collection-name', + 'Name', + this.model.get('name'), + false, + '', + true, + [ + { + rule: Joi.string().regex(/^[a-zA-Z]/), + msg: 'Collection name must always start with a letter.' + }, + { + rule: Joi.string().regex(/^[a-zA-Z0-9\-_]*$/), + msg: 'Only Symbols "_" and "-" are allowed.' + }, + { + rule: Joi.string().required(), + msg: 'No collection name given.' + } + ] + ) + ); + } } var after = function () {