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

Fixed code smell 'Variables should not be shadowed'.

Browse Source
This commit is contained in:
Yogesh Mahajan
2020-07-09 18:44:58 +05:30
committed by Akshay Joshi
parent e1168f8de0
commit 2cefa9afca
3 changed files with 132 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
web/pgadmin/tools/debugger/static/js/debugger_ui.js
View File

@@ -163,7 +163,7 @@ define([
}
};
var res = function(debug_info, restart_debug, is_edb_proc, trans_id) {
var res = function(debugInfo, restartDebug, isEdbProc, transId) {
if (!Alertify.debuggerInputArgsDialog) {
Alertify.dialog('debuggerInputArgsDialog', function factory() {
return {
@@ -242,16 +242,16 @@ define([
method: 'GET',
async: false,
})
.done(function(res) {
if (res.data.args_count != 0) {
for (i = 0; i < res.data.result.length; i++) {
.done(function(res_get) {
if (res_get.data.args_count != 0) {
for (i = 0; i < res_get.data.result.length; i++) {
// Below will format the data to be stored in sqlite database
func_args_data.push({
'arg_id': res.data.result[i]['arg_id'],
'is_null': res.data.result[i]['is_null'],
'is_expression': res.data.result[i]['is_expression'],
'use_default': res.data.result[i]['use_default'],
'value': res.data.result[i]['value'],
'arg_id': res_get.data.result[i]['arg_id'],
'is_null': res_get.data.result[i]['is_null'],
'is_expression': res_get.data.result[i]['is_expression'],
'use_default': res_get.data.result[i]['use_default'],
'value': res_get.data.result[i]['value'],
});
}
}
@@ -751,11 +751,11 @@ define([
'data': JSON.stringify(args_value_list),
},
})
.done(function(res) {
.done(function(res_post) {
var url = url_for(
'debugger.direct', {
'trans_id': res.data.debuggerTransId,
'trans_id': res_post.data.debuggerTransId,
}
);
@@ -779,7 +779,7 @@ define([
// Panel Closed event
panel.on(wcDocker.EVENT.CLOSED, function() {
var closeUrl = url_for('debugger.close', {
'trans_id': res.data.debuggerTransId,
'trans_id': res_post.data.debuggerTransId,
});
$.ajax({
url: closeUrl,
@@ -787,17 +787,17 @@ define([
});
});
}
var _Url;
var _url;
if (d._type == 'function') {
_Url = url_for('debugger.set_arguments', {
_url = url_for('debugger.set_arguments', {
'sid': treeInfo.server._id,
'did': treeInfo.database._id,
'scid': treeInfo.schema._id,
'func_id': treeInfo.function._id,
});
} else if (d._type == 'procedure') {
_Url = url_for('debugger.set_arguments', {
_url = url_for('debugger.set_arguments', {
'sid': treeInfo.server._id,
'did': treeInfo.database._id,
'scid': treeInfo.schema._id,
@@ -805,7 +805,7 @@ define([
});
} else if (d._type == 'edbfunc') {
// Get the existing function parameters available from sqlite database
_Url = url_for('debugger.set_arguments', {
_url = url_for('debugger.set_arguments', {
'sid': treeInfo.server._id,
'did': treeInfo.database._id,
'scid': treeInfo.schema._id,
@@ -813,7 +813,7 @@ define([
});
} else if (d._type == 'edbproc') {
// Get the existing function parameters available from sqlite database
_Url = url_for('debugger.set_arguments', {
_url = url_for('debugger.set_arguments', {
'sid': treeInfo.server._id,
'did': treeInfo.database._id,
'scid': treeInfo.schema._id,
@@ -822,7 +822,7 @@ define([
}
$.ajax({
url: _Url,
url: _url,
method: 'POST',
data: {
'data': JSON.stringify(sqlite_func_args_list),
@@ -836,10 +836,10 @@ define([
);
});
})
.fail(function(e) {
.fail(function(er) {
Alertify.alert(
gettext('Debugger Target Initialization Error'),
e.responseJSON.errormsg
er.responseJSON.errormsg
);
});
} else {
@@ -857,10 +857,10 @@ define([
},
})
.done(function() {})
.fail(function(e) {
.fail(function(er) {
Alertify.alert(
gettext('Debugger Listener Startup Error'),
e.responseJSON.errormsg
er.responseJSON.errormsg
);
});
@@ -902,50 +902,50 @@ define([
}
if (e.button.text === gettext('Clear All')) {
let self = this;
let baseUrl = null;
let _self = this;
let base_url = null;
if (self.setting('restart_debug') == 0) {
if (_self.setting('restart_debug') == 0) {
let selected_item = pgBrowser.tree.selected();
let item_data = pgBrowser.tree.itemData(selected_item);
if (!item_data)
return;
let node = pgBrowser.Nodes[item_data._type];
let treeInfo = node.getTreeNodeHierarchy.call(node, selected_item);
let node_ele = pgBrowser.Nodes[item_data._type];
let tree_info = node_ele.getTreeNodeHierarchy.call(node_ele, selected_item);
baseUrl = url_for('debugger.clear_arguments', {
'sid': treeInfo.server._id,
'did': treeInfo.database._id,
'scid': treeInfo.schema._id,
base_url = url_for('debugger.clear_arguments', {
'sid': tree_info.server._id,
'did': tree_info.database._id,
'scid': tree_info.schema._id,
'func_id': item_data._id,
});
} else {
baseUrl = url_for('debugger.clear_arguments', {
'sid': self.setting('debug_info').server_id,
'did': self.setting('debug_info').database_id,
'scid': self.setting('debug_info').schema_id,
'func_id': self.setting('debug_info').function_id,
base_url = url_for('debugger.clear_arguments', {
'sid': _self.setting('debug_info').server_id,
'did': _self.setting('debug_info').database_id,
'scid': _self.setting('debug_info').schema_id,
'func_id': _self.setting('debug_info').function_id,
});
}
$.ajax({
url: baseUrl,
url: base_url,
method: 'POST',
data: {
'data': JSON.stringify(args_value_list),
},
}).done(function() {
/* Disable debug button */
self.__internal.buttons[2].element.disabled = true;
self.main(self.setting('title'), self.setting('debug_info'),
self.setting('restart_debug'), self.setting('is_edb_proc'),
self.setting('trans_id')
_self.__internal.buttons[2].element.disabled = true;
_self.main(_self.setting('title'), _self.setting('debug_info'),
_self.setting('restart_debug'), _self.setting('is_edb_proc'),
_self.setting('trans_id')
);
self.prepare();
}).fail(function(e) {
_self.prepare();
}).fail(function(er) {
Alertify.alert(
gettext('Clear failed'),
e.responseJSON.errormsg
er.responseJSON.errormsg
);
});
@@ -1023,7 +1023,7 @@ define([
}
Alertify.debuggerInputArgsDialog(
gettext('Debugger'), debug_info, restart_debug, is_edb_proc, trans_id
gettext('Debugger'), debugInfo, restartDebug, isEdbProc, transId
).resizeTo(pgBrowser.stdW.md,pgBrowser.stdH.md);
};

14
web/pgadmin/tools/debugger/static/js/direct.js
View File

@@ -684,12 +684,12 @@ define([
} else {
// Debugging of void function is started again so we need to start
// the listener again
var baseUrl = url_for('debugger.start_listener', {
var base_url = url_for('debugger.start_listener', {
'trans_id': trans_id,
});
$.ajax({
url: baseUrl,
url: base_url,
method: 'GET',
})
.done(function() {
@@ -894,9 +894,9 @@ define([
.done(function(res) {
if (res.data.status) {
// Call function to create and update local variables ....
var info = pgTools.DirectDebug.editor.lineInfo(self.active_line_no);
var info_local = pgTools.DirectDebug.editor.lineInfo(self.active_line_no);
if (info.gutterMarkers != undefined) {
if (info_local.gutterMarkers != undefined) {
pgTools.DirectDebug.editor.setGutterMarker(self.active_line_no, 'breakpoints', null);
} else {
pgTools.DirectDebug.editor.setGutterMarker(self.active_line_no, 'breakpoints', function() {
@@ -955,12 +955,12 @@ define([
})
.done(function(res) {
if (res.data.status) {
for (var i = 0; i < breakpoint_list.length; i++) {
var info = pgTools.DirectDebug.editor.lineInfo((breakpoint_list[i] - 1));
for (var j = 0; j < breakpoint_list.length; j++) {
var info = pgTools.DirectDebug.editor.lineInfo((breakpoint_list[j] - 1));
if (info) {
if (info.gutterMarkers != undefined) {
pgTools.DirectDebug.editor.setGutterMarker((breakpoint_list[i] - 1), 'breakpoints', null);
pgTools.DirectDebug.editor.setGutterMarker((breakpoint_list[j] - 1), 'breakpoints', null);
}
}
}