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

When selecting an SSL cert or key, update only the expected path in the UI, not all of them. Fixes #2760. Fixes #2867

Browse Source
This commit is contained in:
Harshal Dhumal 2017-11-21 15:59:44 +00:00 committed by Dave Page
parent dd8e2fe8a6
commit 9212699936
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/pgadmin/misc/file_manager/static/js/file_manager.js
View File

@ -159,6 +159,7 @@ define('misc.file_manager', [
$(innerbody).find('*').off(); $(innerbody).find('*').off();
innerbody.remove(); innerbody.remove();
removeTransId(trans_id); removeTransId(trans_id);
pgAdmin.Browser.Events.trigger('pgadmin-storage:cancel_btn:storage_dialog');
} }
}, },
build: function() { build: function() {
@ -285,6 +286,7 @@ define('misc.file_manager', [
$(innerbody).find('*').off(); $(innerbody).find('*').off();
innerbody.remove(); innerbody.remove();
removeTransId(trans_id); removeTransId(trans_id);
pgAdmin.Browser.Events.trigger('pgadmin-storage:cancel_btn:select_file');
} }
}, },
build: function() { build: function() {
@ -409,6 +411,7 @@ define('misc.file_manager', [
$(innerbody).find('*').off(); $(innerbody).find('*').off();
innerbody.remove(); innerbody.remove();
removeTransId(trans_id); removeTransId(trans_id);
pgAdmin.Browser.Events.trigger('pgadmin-storage:cancel_btn:select_folder');
} }
}, },
build: function() { build: function() {
@ -632,6 +635,7 @@ define('misc.file_manager', [
$(innerbody).find('*').off(); $(innerbody).find('*').off();
innerbody.remove(); innerbody.remove();
removeTransId(trans_id); removeTransId(trans_id);
pgAdmin.Browser.Events.trigger('pgadmin-storage:cancel_btn:create_file');
} }
}, },
build: function() { build: function() {

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

@ -2163,9 +2163,6 @@
}, },
initialize: function(){ initialize: function(){
Backform.InputControl.prototype.initialize.apply(this, arguments); Backform.InputControl.prototype.initialize.apply(this, arguments);
// Listen click events of Storage Manager dialog buttons
pgAdmin.Browser.Events.on('pgadmin-storage:finish_btn:'+this.field.get('dialog_type'), this.storage_dlg_hander, this);
}, },
template: _.template([ template: _.template([
'<label class="<%=Backform.controlLabelClassName%>"><%=label%></label>', '<label class="<%=Backform.controlLabelClassName%>"><%=label%></label>',
@ -2199,15 +2196,30 @@
pgAdmin.FileManager.init(); pgAdmin.FileManager.init();
pgAdmin.FileManager.show_dialog(params); pgAdmin.FileManager.show_dialog(params);
// Listen click events of Storage Manager dialog buttons
this.listen_file_dlg_events();
}, },
storage_dlg_hander: function(value) { storage_dlg_hander: function(value) {
var field = _.defaults(this.field.toJSON(), this.defaults), var field = _.defaults(this.field.toJSON(), this.defaults),
attrArr = this.field.get("name").split('.'), attrArr = this.field.get("name").split('.'),
name = attrArr.shift(); name = attrArr.shift();
this.remove_file_dlg_event_listeners();
// Set selected value into the model // Set selected value into the model
this.model.set(name, decodeURI(value)); this.model.set(name, decodeURI(value));
}, },
storage_close_dlg_hander: function() {
this.remove_file_dlg_event_listeners();
},
listen_file_dlg_events: function() {
pgAdmin.Browser.Events.on('pgadmin-storage:finish_btn:'+this.field.get('dialog_type'), this.storage_dlg_hander, this);
pgAdmin.Browser.Events.on('pgadmin-storage:cancel_btn:'+this.field.get('dialog_type'), this.storage_close_dlg_hander, this);
},
remove_file_dlg_event_listeners: function() {
pgAdmin.Browser.Events.off('pgadmin-storage:finish_btn:'+this.field.get('dialog_type'), this.storage_dlg_hander, this);
pgAdmin.Browser.Events.off('pgadmin-storage:cancel_btn:'+this.field.get('dialog_type'), this.storage_close_dlg_hander, this);
},
clearInvalid: function() { clearInvalid: function() {
Backform.InputControl.prototype.clearInvalid.apply(this, arguments); Backform.InputControl.prototype.clearInvalid.apply(this, arguments);
this.$el.removeClass("pgadmin-file-has-error"); this.$el.removeClass("pgadmin-file-has-error");