public inbox for [email protected]  
help / color / mirror / Atom feed
[pgAdmin][RM6414]: Help message not displaying correctly on Create - Login/Group Role
2+ messages / 2 participants
[nested] [flat]

* [pgAdmin][RM6414]: Help message not displaying correctly on Create - Login/Group Role
@ 2021-05-16 11:15 Pradip Parkale <[email protected]>
  2021-05-17 07:43 ` Re: [pgAdmin][RM6414]: Help message not displaying correctly on Create - Login/Group Role Akshay Joshi <[email protected]>
  0 siblings, 1 reply; 2+ messages in thread

From: Pradip Parkale @ 2021-05-16 11:15 UTC (permalink / raw)
  To: pgadmin-hackers

Hi Hackers,

Please find the attached patch for #6414 Help message not displaying
correctly on Create - Login/Group Role.

-- 
Thanks & Regards,
Pradip Parkale
Software Engineer | EnterpriseDB Corporation


Attachments:

  [application/octet-stream] RM6414.patch (2.1K, 3-RM6414.patch)
  download | inline diff:
diff --git a/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js b/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js
index 92a02735a..dcb99eb26 100644
--- a/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js
+++ b/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js
@@ -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.');
-          }
-        },
       }),
     });
   }


^ permalink  raw  reply  [nested|flat] 2+ messages in thread

* Re: [pgAdmin][RM6414]: Help message not displaying correctly on Create - Login/Group Role
  2021-05-16 11:15 [pgAdmin][RM6414]: Help message not displaying correctly on Create - Login/Group Role Pradip Parkale <[email protected]>
@ 2021-05-17 07:43 ` Akshay Joshi <[email protected]>
  0 siblings, 0 replies; 2+ messages in thread

From: Akshay Joshi @ 2021-05-17 07:43 UTC (permalink / raw)
  To: Pradip Parkale <[email protected]>; +Cc: pgadmin-hackers

Thanks, patch applied.

On Sun, May 16, 2021 at 4:46 PM Pradip Parkale <
[email protected]> wrote:

> Hi Hackers,
>
> Please find the attached patch for #6414 Help message not displaying
> correctly on Create - Login/Group Role.
>
> --
> Thanks & Regards,
> Pradip Parkale
> Software Engineer | EnterpriseDB Corporation
>


-- 
*Thanks & Regards*
*Akshay Joshi*
*pgAdmin Hacker | Principal Software Architect*
*EDB Postgres <http://edbpostgres.com>*

*Mobile: +91 976-788-8246*


^ permalink  raw  reply  [nested|flat] 2+ messages in thread


end of thread, other threads:[~2021-05-17 07:43 UTC | newest]

Thread overview: 2+ messages (download: mbox mbox.gz follow: Atom feed)
-- links below jump to the message on this page --
2021-05-16 11:15 [pgAdmin][RM6414]: Help message not displaying correctly on Create - Login/Group Role Pradip Parkale <[email protected]>
2021-05-17 07:43 ` Akshay Joshi <[email protected]>

This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox