Fixed code smell 'Variable should not be shadowed'

This commit is contained in:
Satish V 2020-07-06 11:31:36 +05:30 committed by Akshay Joshi
parent cb1cdd1b23
commit fcf720a5d8
2 changed files with 29 additions and 29 deletions

View File

@ -763,7 +763,7 @@ define([
}), }),
beforeNext: function(obj) { beforeNext: function(obj) {
var self = this; var ctx = this;
obj.options.disable_next = true; obj.options.disable_next = true;
/** /**
@ -777,10 +777,10 @@ define([
} }
// Clean the view // Clean the view
if (self.view) { if (ctx.view) {
self.view.cleanup(); ctx.view.cleanup();
delete self.view; delete ctx.view;
self.view = null; ctx.view = null;
} }
return true; return true;
}, },
@ -1019,24 +1019,24 @@ define([
// This method fetches the modified SQL for the wizard // This method fetches the modified SQL for the wizard
onWizardNextPageChange: function() { onWizardNextPageChange: function() {
var self = this; var ctx = this;
// Fetches modified SQL // Fetches modified SQL
$.ajax({ $.ajax({
url: this.msql_url, url: this.msql_url,
type: 'POST', type: 'POST',
cache: false, cache: false,
data: JSON.stringify(self.model.toJSON(true)), data: JSON.stringify(ctx.model.toJSON(true)),
dataType: 'json', dataType: 'json',
contentType: 'application/json', contentType: 'application/json',
}).done(function(res) { }).done(function(res) {
self.sqlCtrl.clearHistory(); ctx.sqlCtrl.clearHistory();
self.sqlCtrl.setValue(res.data); ctx.sqlCtrl.setValue(res.data);
self.sqlCtrl.refresh(); ctx.sqlCtrl.refresh();
}).fail(function() { }).fail(function() {
self.model.trigger('pgadmin-view:msql:error'); ctx.model.trigger('pgadmin-view:msql:error');
}).always(function() { }).always(function() {
self.model.trigger('pgadmin-view:msql:fetched'); ctx.model.trigger('pgadmin-view:msql:fetched');
}); });
}, },
@ -1144,12 +1144,12 @@ define([
// Callback for finish button // Callback for finish button
onFinish: function() { onFinish: function() {
var m = newModel, var m = newModel,
d = m.toJSON('GET'); grant_data = m.toJSON('GET');
// Save model // Save model
if (d && !_.isEmpty(d) && !_.isUndefined(d.objects)) { if (grant_data && !_.isEmpty(grant_data) && !_.isUndefined(grant_data.objects)) {
m.save({}, { m.save({}, {
attrs: d, attrs: grant_data,
validate: false, validate: false,
cache: false, cache: false,
success: function() { success: function() {

View File

@ -478,10 +478,10 @@ define([
Alertify.dialog('ImportDialog', function factory() { Alertify.dialog('ImportDialog', function factory() {
return { return {
main: function(title, node, item, data) { main: function(title, pg_node, pg_item, data) {
this.set('title', title); this.set('title', title);
this.setting('pg_node', node); this.setting('pg_node', pg_node);
this.setting('pg_item', item); this.setting('pg_item', pg_item);
this.setting('pg_item_data', data); this.setting('pg_item_data', data);
}, },
@ -523,19 +523,19 @@ define([
var n = this.settings['pg_node'], var n = this.settings['pg_node'],
i = this.settings['pg_item'], i = this.settings['pg_item'],
treeInfo = n.getTreeNodeHierarchy.apply(n, [i]); treeData = n.getTreeNodeHierarchy.apply(n, [i]);
this.view.model.set({ this.view.model.set({
'database': treeInfo.database._label, 'database': treeData.database._label,
'schema': treeInfo.schema._label, 'schema': treeData.schema._label,
'table': treeInfo.table._label, 'table': treeData.table._label,
}); });
var self = this; var self = this;
$.ajax({ $.ajax({
url: url_for( url: url_for(
'import_export.create_job', { 'import_export.create_job', {
'sid': treeInfo.server._id, 'sid': treeData.server._id,
} }
), ),
method: 'POST', method: 'POST',
@ -561,8 +561,8 @@ define([
gettext('Import/Export job failed.'), gettext('Import/Export job failed.'),
err.errormsg err.errormsg
); );
} catch (e) { } catch (error) {
console.warn(e.stack || e); console.warn(error.stack || error);
} }
}); });
} }
@ -605,13 +605,13 @@ define([
var $container = $('<div class=\'import_dlg\'></div>'), var $container = $('<div class=\'import_dlg\'></div>'),
n = this.settings.pg_node, n = this.settings.pg_node,
i = this.settings.pg_item, itemArr = this.settings.pg_item,
treeInfo = n.getTreeNodeHierarchy.apply(n, [i]), treeData = n.getTreeNodeHierarchy.apply(n, [itemArr]),
newModel = new ImportExportModel({}, { newModel = new ImportExportModel({}, {
node_info: treeInfo, node_info: treeData,
}), }),
fields = Backform.generateViewSchema( fields = Backform.generateViewSchema(
treeInfo, newModel, 'create', node, treeInfo.server, true treeData, newModel, 'create', node, treeData.server, true
), ),
view = this.view = new Backform.Dialog({ view = this.view = new Backform.Dialog({
el: $container, el: $container,