IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-09 23:15:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

Do not close the privilege cell editor, when clicked one of its own

Browse Source 
children.

Also, resolved an issue related showing 'unknown' instead of privileges,
when loading existing privileges.
This commit is contained in:
Harshal Dhumal 2016-01-04 16:59:22 +05:30 committed by Ashesh Vashi
parent 9d9f17c163
commit eed1590a51
1 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
web/pgadmin/browser/server_groups/servers/static/js/privilege.js
View File

@ -222,6 +222,10 @@
}));
self.$el.find('input[type=checkbox]').first().focus();
// Since blur event does not bubble we need to explicitly call parent's blur event.
$(self.$el.find('input[type=checkbox]')).on('blur',function() {
self.$el.blur();
});
self.delegateEvents();
return this;
@ -368,10 +372,34 @@
lostFocus: function(ev) {
/*
* We lost the focuse, it's time for us to exit the editor.
* We lost the focus, it's time for us to exit the editor.
*/
var m = this.model;
m.trigger('backgrid:edited', m, this.column, new Backgrid.Command(ev));
var self = this,
/*
* Function to determine whether one dom element is descendant of another
* dom element.
*/
isDescendant = function (parent, child) {
var node = child.parentNode;
while (node != null) {
if (node == parent) {
return true;
}
node = node.parentNode;
}
return false;
}
/*
* Between leaving the old element focus and entering the new element focus the
* active element is the document/body itself so add timeout to get the proper
* focused active element.
*/
setTimeout(function() {
if (self.$el[0] != document.activeElement && !isDescendant(self.$el[0], document.activeElement)){
var m = self.model;
m.trigger('backgrid:edited', m, self.column, new Backgrid.Command(ev));
}},10);
return;
}
});
@ -407,7 +435,7 @@
if (rawData instanceof Backbone.Collection) {
rawData.each(function(m) {
if (m.get('privilege')) {
res += self.notation[m.get('privilege_type')];
res += m.get('privilege_type');
if (m.get('with_grant')) {
res += '*';
}