public inbox for [email protected]  

help / color / mirror / Atom feed
From: Khushboo Vashi <[email protected]>
To: pgadmin-hackers <[email protected]>
Subject: [pgAdmin4][Patch] - RM 5911- Query is not executing on Manage macro safari 13 and Chrome 75.0 browsers
Date: Tue, 13 Oct 2020 11:29:08 +0530
Message-ID: <CAFOhELcLTkrZWRrYQBJ1gh86oLwvqtx9njcr7eLgeqBJsZPP5A@mail.gmail.com> (raw)

Hi,

Please find the attached patch to run macros on the older versions of
browsers.

Thanks,
Khushboo


Attachments:

  [application/octet-stream] RM_5911.patch (892B, 3-RM_5911.patch)
  download | inline diff:
diff --git a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
index 058e21a2f..b2f22e629 100644
--- a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
+++ b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
@@ -2801,7 +2801,8 @@ define('tools.querytool', [
           .done(function(res) {
             if (res) {
               // Replace the place holder
-              let query = res.sql.replaceAll('$SELECTION$', self.gridView.query_tool_obj.getSelection());
+              const regex = /\$SELECTION\$/gi;
+              let query =  res.sql.replace(regex, self.gridView.query_tool_obj.getSelection());
 
               const executeQuery = new ExecuteQuery.ExecuteQuery(self, pgAdmin.Browser.UserManagement);
               executeQuery.poll = pgBrowser.override_activity_event_decorator(executeQuery.poll).bind(executeQuery);


view thread (2+ messages)  latest in thread

reply
Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Reply to all the recipients using the --to and --cc options:
  reply via email

  To: [email protected]
  Cc: [email protected]
  Subject: Re: [pgAdmin4][Patch] - RM 5911- Query is not executing on Manage macro safari 13 and Chrome 75.0 browsers
  In-Reply-To: <CAFOhELcLTkrZWRrYQBJ1gh86oLwvqtx9njcr7eLgeqBJsZPP5A@mail.gmail.com>

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

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