IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2024-12-22 15:13:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_5_3.rst
View File

@ -35,6 +35,7 @@ Bug fixes
| `Issue #6408 <https://redmine.postgresql.org/issues/6408>`_ - Fixed ModuleNotFoundError when running setup.py from outside of the root.
| `Issue #6409 <https://redmine.postgresql.org/issues/6409>`_ - Fixed an issue where the current debug line is not visible in the 'Dark' theme.
| `Issue #6413 <https://redmine.postgresql.org/issues/6413>`_ - Fixed an issue where duplicate columns are visible in the browser tree, which is owned by two sequences.
| `Issue #6414 <https://redmine.postgresql.org/issues/6414>`_ - Fixed an issue where the Help message not displaying correctly on Login/Group role.
| `Issue #6416 <https://redmine.postgresql.org/issues/6416>`_ - Added comment column in the properties panel for View and Materialized View collection node.
| `Issue #6417 <https://redmine.postgresql.org/issues/6417>`_ - Fixed an issue where query editor is not being closed if the user clicks on the 'Don't Save' button.
| `Issue #6420 <https://redmine.postgresql.org/issues/6420>`_ - Ensure that pgAdmin4 shut down completely on the Quit command.

23
web/pgadmin/browser/server_groups/servers/roles/static/js/role.js
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.');
}
},
}),
});
}