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 the following issues:

Browse Source 
RM-4232:
1. If the user adds a percentage (other than for placeholders) then it is stripped off.
2. Backslash is getting removed in the connection string if we provide the backslash(\) in placeholders or the database name contains it.
3. If the user added only spaces( )in placeholders it is not getting reset to default values.

RM-4230:
1. Rename panel option is not working in the debugger.
2. Added Rename panel for schema diff.

Fixes #4232 #4230
This commit is contained in:
Nikhil Mohite
2020-10-27 11:03:00 +05:30
committed by Akshay Joshi
parent 892fb83907
commit b5f9fffadd
9 changed files with 75 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
web/pgadmin/tools/schema_diff/static/js/schema_diff.js
View File

@@ -9,9 +9,9 @@
define('pgadmin.schemadiff', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'sources/pgadmin', 'sources/csrf', 'pgadmin.browser.node',
'sources/pgadmin', 'sources/csrf', 'pgadmin.alertifyjs', 'pgadmin.browser.node',
], function(
gettext, url_for, $, _, pgAdmin, csrfToken
gettext, url_for, $, _, pgAdmin, csrfToken, Alertify,
) {
var wcDocker = window.wcDocker,
@@ -113,6 +113,21 @@ define('pgadmin.schemadiff', [
var propertiesPanel = pgBrowser.docker.findPanels('properties'),
schemaDiffPanel = pgBrowser.docker.addPanel('frm_schemadiff', wcDocker.DOCK.STACKED, propertiesPanel[0]);
// Rename schema diff tab
schemaDiffPanel.on(wcDocker.EVENT.RENAME, function(panel_data) {
Alertify.prompt('', panel_data.$titleText[0].textContent,
// We will execute this function when user clicks on the OK button
function(evt, value) {
if(value) {
schemaDiffPanel.title('<span>'+ _.escape(value) +'</span>');
}
},
// We will execute this function when user clicks on the Cancel
// button. Do nothing just close it.
function(evt) { evt.cancel = false; }
).set({'title': gettext('Rename Panel')});
});
// Set panel title and icon
schemaDiffPanel.title('<span title="'+panel_tooltip+'">'+panel_title+'</span>');
schemaDiffPanel.icon('pg-font-icon icon-schema-diff');

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

@@ -108,7 +108,6 @@ export default class SchemaDiffUI {
this.resize_panels();
}.bind(self), 200);
});
}
raise_error_on_fail(alert_title, xhr) {