IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix an issue in query tool where it was not able to handle special characters in editor title.

Browse Source 
Fixes #1381
This commit is contained in:
Murtuza Zabuawala 2016-06-21 09:30:34 +01:00 committed by Dave Page
parent a563e17f9b
commit a1f65e981f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/pgadmin/tools/datagrid/__init__.py
View File

@ -134,7 +134,7 @@ def initialize_datagrid(cmd_type, obj_type, sid, did, obj_id):
return make_json_response(data={'gridTransId': trans_id}) return make_json_response(data={'gridTransId': trans_id})
@blueprint.route('/panel/<int:trans_id>/<is_query_tool>/<editor_title>', methods=["GET"]) @blueprint.route('/panel/<int:trans_id>/<is_query_tool>/<path:editor_title>', methods=["GET"])
def panel(trans_id, is_query_tool, editor_title): def panel(trans_id, is_query_tool, editor_title):
""" """
This method calls index.html to render the data grid. This method calls index.html to render the data grid.

5
web/pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js
View File

@ -323,7 +323,8 @@ define(
}); });
// Open the panel if frame is initialized // Open the panel if frame is initialized
baseUrl = "{{ url_for('datagrid.index') }}" + "panel/" + res.data.gridTransId + "/false/" + grid_title; baseUrl = "{{ url_for('datagrid.index') }}" + "panel/" + res.data.gridTransId + "/false/"
+ encodeURIComponent(grid_title);
var openDataGridURL = function(j) { var openDataGridURL = function(j) {
setTimeout(function() { setTimeout(function() {
var frameInitialized = j.data('frameInitialized'); var frameInitialized = j.data('frameInitialized');
@ -419,7 +420,7 @@ define(
// Open the panel if frame is initialized // Open the panel if frame is initialized
baseUrl = "{{ url_for('datagrid.index') }}" + "panel/" + res.data.gridTransId + "/true/" baseUrl = "{{ url_for('datagrid.index') }}" + "panel/" + res.data.gridTransId + "/true/"
+ grid_title + '?' + "query_url=" + encodeURI(sURL); + encodeURIComponent(grid_title) + '?' + "query_url=" + encodeURI(sURL);
var openQueryToolURL = function(j) { var openQueryToolURL = function(j) {
setTimeout(function() { setTimeout(function() {
var frameInitialized = j.data('frameInitialized'); var frameInitialized = j.data('frameInitialized');