public inbox for [email protected]  

help / color / mirror / Atom feed

[pgAdmin4][Patch] - RM 5911- Query is not executing on Manage macro safari 13 and Chrome 75.0 browsers
2+ messages / 2 participants
[nested] [flat]

* [pgAdmin4][Patch] - RM 5911- Query is not executing on Manage macro safari 13 and Chrome 75.0 browsers
@ 2020-10-13 05:59 Khushboo Vashi <[email protected]>
  2020-10-15 10:50 ` Re: [pgAdmin4][Patch] - RM 5911- Query is not executing on Manage macro safari 13 and Chrome 75.0 browsers Akshay Joshi <[email protected]>
  0 siblings, 1 reply; 2+ messages in thread

From: Khushboo Vashi @ 2020-10-13 05:59 UTC (permalink / raw)
  To: pgadmin-hackers

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);


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

* Re: [pgAdmin4][Patch] - RM 5911- Query is not executing on Manage macro safari 13 and Chrome 75.0 browsers
  2020-10-13 05:59 [pgAdmin4][Patch] - RM 5911- Query is not executing on Manage macro safari 13 and Chrome 75.0 browsers Khushboo Vashi <[email protected]>
@ 2020-10-15 10:50 ` Akshay Joshi <[email protected]>
  0 siblings, 0 replies; 2+ messages in thread

From: Akshay Joshi @ 2020-10-15 10:50 UTC (permalink / raw)
  To: Khushboo Vashi <[email protected]>; +Cc: pgadmin-hackers

Thanks, patch applied.

On Tue, Oct 13, 2020 at 11:29 AM Khushboo Vashi <
[email protected]> wrote:

> Hi,
>
> Please find the attached patch to run macros on the older versions of
> browsers.
>
> Thanks,
> Khushboo
>
>

-- 
*Thanks & Regards*
*Akshay Joshi*
*pgAdmin Hacker | Sr. 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:[~2020-10-15 10:50 UTC | newest]

Thread overview: 2+ messages (download: mbox mbox.gz follow: Atom feed)
-- links below jump to the message on this page --
2020-10-13 05:59 [pgAdmin4][Patch] - RM 5911- Query is not executing on Manage macro safari 13 and Chrome 75.0 browsers Khushboo Vashi <[email protected]>
2020-10-15 10:50 ` 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