Fixed an issue where the Help message not displaying correctly on Login/Group role. Fixes #6414

This commit is contained in:
Pradip Parkale
2021-05-17 13:08:38 +05:30
committed by Akshay Joshi
parent 42b8dbb58f
commit 4676d7ef02
2 changed files with 15 additions and 9 deletions

View File

@@ -515,7 +515,13 @@ define('pgadmin.node.role', [
filter: function(d) {
return this.model.isNew() || (this.model.get('rolname') != d.label);
},
helpMessage: 'helpMessage',
helpMessage: function(m) {
if (m.has('read_only') && m.get('read_only') == false) {
return gettext('Select the checkbox for roles to include WITH ADMIN OPTION.');
} else {
return gettext('Roles shown with a check mark have the WITH ADMIN OPTION set.');
}
},
},
{
id: 'rolmembers', label: gettext('Members'), type: 'collection', group: gettext('Membership'),
@@ -535,7 +541,13 @@ define('pgadmin.node.role', [
filter: function(d) {
return this.model.isNew() || (this.model.get('rolname') != d.label);
},
helpMessage: 'helpMessage',
helpMessage: function(m) {
if (m.has('read_only') && m.get('read_only') == false) {
return gettext('Select the checkbox for roles to include WITH ADMIN OPTION.');
} else {
return gettext('Roles shown with a check mark have the WITH ADMIN OPTION set.');
}
},
},
{
id: 'variables', label: '', type: 'collection',
@@ -591,13 +603,6 @@ define('pgadmin.node.role', [
return null;
},
helpMessage: function(m) {
if (m.has('read_only') && m.get('read_only') == false) {
return gettext('Select the checkbox for roles to include WITH ADMIN OPTION.');
} else {
return gettext('Roles shown with a check mark have the WITH ADMIN OPTION set.');
}
},
}),
});
}