public inbox for [email protected]
help / color / mirror / Atom feed[pgAdmin] [patch] RM6333 Help dialog issue if we set "Open in new browser tab" for Query tool & ERD.
2+ messages / 2 participants
[nested] [flat]
* [pgAdmin] [patch] RM6333 Help dialog issue if we set "Open in new browser tab" for Query tool & ERD.
@ 2021-04-06 06:01 Rahul Shirsat <[email protected]>
2021-04-06 10:42 ` Re: [pgAdmin] [patch] RM6333 Help dialog issue if we set "Open in new browser tab" for Query tool & ERD. Akshay Joshi <[email protected]>
0 siblings, 1 reply; 2+ messages in thread
From: Rahul Shirsat @ 2021-04-06 06:01 UTC (permalink / raw)
To: pgadmin-hackers
Hi Hackers,
Please find the attached patch which resolves the issue of help dialogue
for Query tool & ERD tool on nwjs app.
Also in the flow, verified Schema diff & Debugger where no issues found as
these can be opened in the new tab.
--
*Rahul Shirsat*
Senior Software Engineer | EnterpriseDB Corporation.
Attachments:
[application/octet-stream] RM6333.patch (1.3K, 3-RM6333.patch)
download | inline diff:
diff --git a/web/pgadmin/browser/static/js/browser.js b/web/pgadmin/browser/static/js/browser.js
index 67e977daf..4ffb5ee5a 100644
--- a/web/pgadmin/browser/static/js/browser.js
+++ b/web/pgadmin/browser/static/js/browser.js
@@ -907,7 +907,12 @@ define('pgadmin.browser', [
window.open(fullUrl, 'postgres_help');
} else if(type == 'dialog_help') {
- window.open(url, 'pgadmin_help');
+ if (pgWindow && pgWindow.default) {
+ pgWindow.default.open(url, 'pgadmin_help');
+ }
+ else {
+ window.open(url, 'pgadmin_help');
+ }
}
$('#live-search-field').focus();
},
diff --git a/web/pgadmin/tools/erd/static/js/erd_tool/ui_components/BodyWidget.jsx b/web/pgadmin/tools/erd/static/js/erd_tool/ui_components/BodyWidget.jsx
index ff8a9c798..b79252992 100644
--- a/web/pgadmin/tools/erd/static/js/erd_tool/ui_components/BodyWidget.jsx
+++ b/web/pgadmin/tools/erd/static/js/erd_tool/ui_components/BodyWidget.jsx
@@ -412,7 +412,12 @@ export default class BodyWidget extends React.Component {
onHelpClick() {
let url = url_for('help.static', {'filename': 'erd_tool.html'});
- window.open(url, 'pgadmin_help');
+ if (this.props.pgWindow) {
+ this.props.pgWindow.open(url, 'pgadmin_help');
+ }
+ else {
+ window.open(url, 'pgadmin_help');
+ }
}
onLoadDiagram() {
^ permalink raw reply [nested|flat] 2+ messages in thread
* Re: [pgAdmin] [patch] RM6333 Help dialog issue if we set "Open in new browser tab" for Query tool & ERD.
2021-04-06 06:01 [pgAdmin] [patch] RM6333 Help dialog issue if we set "Open in new browser tab" for Query tool & ERD. Rahul Shirsat <[email protected]>
@ 2021-04-06 10:42 ` Akshay Joshi <[email protected]>
0 siblings, 0 replies; 2+ messages in thread
From: Akshay Joshi @ 2021-04-06 10:42 UTC (permalink / raw)
To: Rahul Shirsat <[email protected]>; +Cc: pgadmin-hackers
Thanks, patch applied.
On Tue, Apr 6, 2021 at 11:32 AM Rahul Shirsat <
[email protected]> wrote:
> Hi Hackers,
>
> Please find the attached patch which resolves the issue of help dialogue
> for Query tool & ERD tool on nwjs app.
>
> Also in the flow, verified Schema diff & Debugger where no issues found as
> these can be opened in the new tab.
>
> --
> *Rahul Shirsat*
> Senior 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-04-06 10:42 UTC | newest]
Thread overview: 2+ messages (download: mbox mbox.gz follow: Atom feed)
-- links below jump to the message on this page --
2021-04-06 06:01 [pgAdmin] [patch] RM6333 Help dialog issue if we set "Open in new browser tab" for Query tool & ERD. Rahul Shirsat <[email protected]>
2021-04-06 10:42 ` 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