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 issues introduce by SonarQube fixes.

Browse Source
This commit is contained in:
Akshay Joshi 2022-02-01 14:11:18 +05:30
parent 21359c6c74
commit aa5b1d50b9
6 changed files with 27 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/pgadmin/browser/static/js/browser.js
View File

@ -556,8 +556,6 @@ define('pgadmin.browser', [
'the original/corrupt file using a tool such as DB Browser for SQLite if desired.'+ 'the original/corrupt file using a tool such as DB Browser for SQLite if desired.'+
'<br><br>Original file: ' + res.data + '<br>Replacement file: ' + '<br><br>Original file: ' + res.data + '<br>Replacement file: ' +
res.data.substring(0, res.data.length - 14), res.data.substring(0, res.data.length - 14),
function() { /*This is intentional (SonarQube)*/
}
); );
} }
}).fail(function(xhr, status, error) { }).fail(function(xhr, status, error) {

10
web/pgadmin/browser/static/js/error.js
View File

@ -48,15 +48,13 @@ define(
text += '</div>'; text += '</div>';
Notify.alert( Notify.alert(
_.unescape(title), _.unescape(title),
text text,
) function() {
.set({'closable': true,
'onok': function() {
if(callback) { if(callback) {
callback(); callback();
} }
}, }
}); );
}, },
}); });

11
web/pgadmin/static/js/backgrid.pgadmin.js
View File

@ -453,10 +453,7 @@ define([
); );
} }
} else { } else {
Notify.alert(gettext('Edit object'), gettext('This object is not user editable.'), Notify.alert(gettext('Edit object'), gettext('This object is not user editable.'));
function() {
return true;
});
} }
}, },
render: function() { render: function() {
@ -548,11 +545,7 @@ define([
} }
); );
} else { } else {
Notify.alert(gettext('Delete object'), gettext('This object cannot be deleted.'), Notify.alert(gettext('Delete object'), gettext('This object cannot be deleted.'));
function() {
return true;
}
);
} }
}, },
exitEditMode: function() { exitEditMode: function() {

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

@ -449,7 +449,7 @@ define([
); );
} }
}) })
.fail(self.raisePollingError()); .fail(self.raisePollingError);
}, poll_timeout); }, poll_timeout);
}, },
@ -623,7 +623,7 @@ define([
pgTools.DirectDebug.is_polling_required = false; pgTools.DirectDebug.is_polling_required = false;
} }
}) })
.fail(self.raisePollingError()); .fail(self.raisePollingError);
}, poll_end_timeout); }, poll_end_timeout);
}, },
@ -682,7 +682,7 @@ define([
self.poll_end_execution_result(trans_id); self.poll_end_execution_result(trans_id);
} }
}) })
.fail(self.raisePollingError()); .fail(self.raisePollingError);
} }
}) })
.fail(function(xhr) { .fail(function(xhr) {

6
web/pgadmin/tools/schema_diff/static/js/schema_diff_ui.js
View File

@ -116,10 +116,14 @@ export default class SchemaDiffUI {
raise_error_on_fail(alert_title, xhr) { raise_error_on_fail(alert_title, xhr) {
try { try {
if (_.isUndefined(xhr.responseText)) {
Notify.alert(alert_title, gettext('Unable to get the response text.'));
} else {
var err = JSON.parse(xhr.responseText); var err = JSON.parse(xhr.responseText);
Notify.alert(alert_title, err.errormsg); Notify.alert(alert_title, err.errormsg);
}
} catch (e) { } catch (e) {
Notify.alert(alert_title, e.statusText); Notify.alert(alert_title, gettext(e.message));
} }
} }

12
web/pgadmin/tools/sqleditor/static/js/sqleditor.js
View File

@ -2372,16 +2372,14 @@ define('tools.querytool', [
pgWindow.default.pgAdmin && pgWindow.default.pgAdmin.Browser pgWindow.default.pgAdmin && pgWindow.default.pgAdmin.Browser
&& pgWindow.default.pgAdmin.Browser.preference_version() <= 0) { && pgWindow.default.pgAdmin.Browser.preference_version() <= 0) {
Notify.alert() Notify.alert(gettext('Connection lost'),
.setting({ gettext('The pgAdmin browser window has been closed and the connection to the server is lost. Please close this window and open a new pgAdmin session.'),
'title': gettext('Connection lost'), function(){
'label':gettext('Close'),
'message': gettext('The pgAdmin browser window has been closed and the connection to the server is lost. Please close this window and open a new pgAdmin session.'),
'onok': function(){
//Close the window after connection is lost //Close the window after connection is lost
window.close(); window.close();
}, },
}).show(); gettext('Close')
);
} }
}; };