IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-01-24 07:16:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed an issue where Grant wizard unable to handle multiple objects when the query string parameter exceeds its limit. Fixes #4511

Browse Source
This commit is contained in:
Aditya Toshniwal 2020-01-20 17:53:21 +05:30 committed by Akshay Joshi
parent b4b54d6b94
commit fde8e4054a
5 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_4_18.rst
View File

@ -24,6 +24,7 @@ Bug fixes
*********
| `Issue #3812 <https://redmine.postgresql.org/issues/3812>`_ - Ensure that path file name should not disappear when changing ext from the dropdown in file explorer dialog.
| `Issue #4511 <https://redmine.postgresql.org/issues/4511>`_ - Fixed an issue where Grant wizard unable to handle multiple objects when the query string parameter exceeds its limit.
| `Issue #4827 <https://redmine.postgresql.org/issues/4827>`_ - Fix column resizable issue in the file explorer dialog.
| `Issue #5000 <https://redmine.postgresql.org/issues/5000>`_ - Logout the pgAdmin session when no user activity of mouse move, click or keypress.
| `Issue #5025 <https://redmine.postgresql.org/issues/5025>`_ - Fix an issue where setting STORAGE_DIR to empty should show all the volumes on Windows in server mode.

9
web/pgadmin/browser/static/js/node.ui.js
View File

@ -341,13 +341,18 @@ define([
backgridDivTop = backgridDiv.offset().top,
backgridDivHeight = backgridDiv.height(),
backformTab = $(this).closest(cls), // Backform-tab
gridScroll = backformTab[0].offsetHeight - backgridDivTop;
gridScroll = null;
if(backformTab.length == 0) {
return false;
}
gridScroll = backformTab[0].offsetHeight - backgridDivTop;
if (backgridDivHeight > gridScroll) {
var top = elem.get(0).offsetTop + elem.height();
backformTab.find('.tab-content').scrollTop(top);
}
return;
return true;
});
};

10
web/pgadmin/static/js/backform.pgadmin.js
View File

@ -1421,13 +1421,10 @@ define([
newRow = self.grid.body.rows[idx].$el;
newRow.addClass('new');
try {
$(newRow).pgMakeBackgridVisible('.backform-tab');
} catch(err) {
if(!$(newRow).pgMakeBackgridVisible('.backform-tab')){
// We can have subnode controls in Panels
$(newRow).pgMakeBackgridVisible('.set-group');
}
return false;
}
});
@ -1692,9 +1689,8 @@ define([
newRow.attr('class', 'new').on('click',() => {
$(this).attr('class', 'editable');
});
try {
$(newRow).pgMakeBackgridVisible('.backform-tab');
} catch(err) {
if(!$(newRow).pgMakeBackgridVisible('.backform-tab')){
// We can have subnode controls in Panels
$(newRow).pgMakeBackgridVisible('.set-group');
}

10
web/pgadmin/tools/grant_wizard/__init__.py
View File

@ -336,7 +336,7 @@ def properties(sid, did, node_id, node_type):
@blueprint.route(
'/sql/<int:sid>/<int:did>/',
methods=['GET'], endpoint='modified_sql'
methods=['POST'], endpoint='modified_sql'
)
@login_required
@check_precondition
@ -346,13 +346,7 @@ def msql(sid, did):
"""
server_prop = server_info
data = {}
for k, v in request.args.items():
try:
data[k] = json.loads(v)
except ValueError:
data[k] = v
data = request.form if request.form else json.loads(request.data.decode())
# Form db connection
manager = get_driver(PG_DEFAULT_DRIVER).connection_manager(sid)
conn = manager.connection(did=did)

4
web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
View File

@ -1012,9 +1012,9 @@ define([
// Fetches modified SQL
$.ajax({
url: this.msql_url,
type: 'GET',
type: 'POST',
cache: false,
data: self.model.toJSON(true, 'GET'),
data: JSON.stringify(self.model.toJSON(true)),
dataType: 'json',
contentType: 'application/json',
}).done(function(res) {