public inbox for [email protected]
help / color / mirror / Atom feed[pgAdmin] Bug #5831 Internal server error displayed if user open query tool window inside view data
3+ messages / 2 participants
[nested] [flat]
* [pgAdmin] Bug #5831 Internal server error displayed if user open query tool window inside view data
@ 2020-09-14 08:58 Rahul Shirsat <[email protected]>
2020-09-14 12:07 ` Re: [pgAdmin] Bug #5831 Internal server error displayed if user open query tool window inside view data Rahul Shirsat <[email protected]>
0 siblings, 1 reply; 3+ messages in thread
From: Rahul Shirsat @ 2020-09-14 08:58 UTC (permalink / raw)
To: pgadmin-hackers
Hi Hackers,
Please find the attached patch which fixes the open query tool window
inside view data.
--
*Rahul Shirsat*
Software Engineer | EnterpriseDB Corporation.
Attachments:
[application/octet-stream] RM5831.patch (631B, 3-RM5831.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 ce02a53cb..8ff666393 100644
--- a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
+++ b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
@@ -4302,7 +4302,7 @@ define('tools.querytool', [
'trans_id': transId,
});
- url_endpoint += `?is_query_tool=${that.url_params.is_query_tool}`
+ url_endpoint += `?is_query_tool=${true}`
+`&sgid=${that.url_params.sgid}`
+`&sid=${that.url_params.sid}`
+`&server_type=${that.url_params.server_type}`
^ permalink raw reply [nested|flat] 3+ messages in thread
* Re: [pgAdmin] Bug #5831 Internal server error displayed if user open query tool window inside view data
2020-09-14 08:58 [pgAdmin] Bug #5831 Internal server error displayed if user open query tool window inside view data Rahul Shirsat <[email protected]>
@ 2020-09-14 12:07 ` Rahul Shirsat <[email protected]>
2020-09-14 12:25 ` Re: [pgAdmin] Bug #5831 Internal server error displayed if user open query tool window inside view data Akshay Joshi <[email protected]>
0 siblings, 1 reply; 3+ messages in thread
From: Rahul Shirsat @ 2020-09-14 12:07 UTC (permalink / raw)
To: pgadmin-hackers
Hi Hackers,
Please find below fixes :
1. Query editor via view/edit data - fixed panel title issue.
2. Fixed Schema diff panel title on new tab.
On Mon, Sep 14, 2020 at 2:28 PM Rahul Shirsat <
[email protected]> wrote:
> Hi Hackers,
>
> Please find the attached patch which fixes the open query tool window
> inside view data.
>
> --
> *Rahul Shirsat*
> Software Engineer | EnterpriseDB Corporation.
>
--
*Rahul Shirsat*
Software Engineer | EnterpriseDB Corporation.
Attachments:
[application/octet-stream] RM5831_v2.patch (2.1K, 3-RM5831_v2.patch)
download | inline diff:
diff --git a/web/pgadmin/tools/schema_diff/templates/schema_diff/index.html b/web/pgadmin/tools/schema_diff/templates/schema_diff/index.html
index ef687b8e8..7fa7683d3 100644
--- a/web/pgadmin/tools/schema_diff/templates/schema_diff/index.html
+++ b/web/pgadmin/tools/schema_diff/templates/schema_diff/index.html
@@ -21,6 +21,7 @@ try {
{% block css_link %}
<link type="text/css" rel="stylesheet" href="{{ url_for('browser.browser_css')}}"/>
{% endblock %}
+{% block title %}{{editor_title}}{% endblock %}
{% block body %}
<div id="schema-diff-container">
<div id="diff_fetching_data" class="pg-sp-container schema-diff-busy-fetching d-none">
diff --git a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
index ce02a53cb..3646a9750 100644
--- a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
+++ b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
@@ -4302,13 +4302,24 @@ define('tools.querytool', [
'trans_id': transId,
});
- url_endpoint += `?is_query_tool=${that.url_params.is_query_tool}`
+ url_endpoint += `?is_query_tool=${true}`
+`&sgid=${that.url_params.sgid}`
+`&sid=${that.url_params.sid}`
- +`&server_type=${that.url_params.server_type}`
- +`&did=${that.url_params.did}`;
+ +`&server_type=${that.url_params.server_type}`;
- launchDataGrid(pgWindow.default.pgAdmin.DataGrid, transId, url_endpoint, that.url_params.title, '', alertify);
+ if(that.url_params.did) {
+ url_endpoint += `&did=${that.url_params.did}`;
+ }
+
+ let panel_title = that.url_params.title;
+ if(that.url_params.is_query_tool == 'false') {//check whether query tool is hit from View/Edit
+ var split_title = that.url_params.title.split('/');
+ if(split_title.length > 2) {
+ panel_title = split_title[split_title.length-2] + '/' + split_title[split_title.length-1];
+ }
+ }
+
+ launchDataGrid(pgWindow.default.pgAdmin.DataGrid, transId, url_endpoint, panel_title, '', alertify);
},
/*
^ permalink raw reply [nested|flat] 3+ messages in thread
* Re: [pgAdmin] Bug #5831 Internal server error displayed if user open query tool window inside view data
2020-09-14 08:58 [pgAdmin] Bug #5831 Internal server error displayed if user open query tool window inside view data Rahul Shirsat <[email protected]>
2020-09-14 12:07 ` Re: [pgAdmin] Bug #5831 Internal server error displayed if user open query tool window inside view data Rahul Shirsat <[email protected]>
@ 2020-09-14 12:25 ` Akshay Joshi <[email protected]>
0 siblings, 0 replies; 3+ messages in thread
From: Akshay Joshi @ 2020-09-14 12:25 UTC (permalink / raw)
To: Rahul Shirsat <[email protected]>; +Cc: pgadmin-hackers
Thanks, patch applied.
On Mon, Sep 14, 2020 at 5:38 PM Rahul Shirsat <
[email protected]> wrote:
> Hi Hackers,
>
> Please find below fixes :
>
> 1. Query editor via view/edit data - fixed panel title issue.
> 2. Fixed Schema diff panel title on new tab.
>
>
> On Mon, Sep 14, 2020 at 2:28 PM Rahul Shirsat <
> [email protected]> wrote:
>
>> Hi Hackers,
>>
>> Please find the attached patch which fixes the open query tool window
>> inside view data.
>>
>> --
>> *Rahul Shirsat*
>> Software Engineer | EnterpriseDB Corporation.
>>
>
>
> --
> *Rahul Shirsat*
> Software Engineer | EnterpriseDB Corporation.
>
--
*Thanks & Regards*
*Akshay Joshi*
*pgAdmin Hacker | Sr. Software Architect*
*EDB Postgres <http://edbpostgres.com>*
*Mobile: +91 976-788-8246*
^ permalink raw reply [nested|flat] 3+ messages in thread
end of thread, other threads:[~2020-09-14 12:25 UTC | newest]
Thread overview: 3+ messages (download: mbox mbox.gz follow: Atom feed)
-- links below jump to the message on this page --
2020-09-14 08:58 [pgAdmin] Bug #5831 Internal server error displayed if user open query tool window inside view data Rahul Shirsat <[email protected]>
2020-09-14 12:07 ` Rahul Shirsat <[email protected]>
2020-09-14 12:25 ` 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