IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-01-27 16:57:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Set proper context object, when triggering the 'pgadmin-session' events

Browse Source 
in order to resolve few corner cases for validation.
This commit is contained in:
Ashesh Vashi 2016-04-29 15:56:51 +05:30
parent 32e0a0d4b6
commit 9ef7132e83
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
web/pgadmin/browser/static/js/datamodel.js
View File

@ -308,7 +308,7 @@ function(_, pgAdmin, $, Backbone) {
if (_.size(self.errorModel.attributes) == 0) {
if (self.collection || self.handler) {
(self.collection || self.handler).trigger(
'pgadmin-session:model:valid', self
'pgadmin-session:model:valid', self, (self.collection || self.handler)
);
} else {
self.trigger('pgadmin-session:valid', self.sessChanged(), self);
@ -317,7 +317,7 @@ function(_, pgAdmin, $, Backbone) {
msg = msg || _.values(self.errorModel.attributes)[0];
if (self.collection || self.handler) {
(self.collection || self.handler).trigger(
'pgadmin-session:model:invalid', msg, self
'pgadmin-session:model:invalid', msg, self, (self.collection || self.handler)
);
} else {
self.trigger('pgadmin-session:invalid', msg, self);
@ -471,7 +471,7 @@ function(_, pgAdmin, $, Backbone) {
self.errorModel.set(objName, msg);
if (self.handler) {
(self.handler).trigger('pgadmin-session:model:invalid', msg, self);
(self.handler).trigger('pgadmin-session:model:invalid', msg, self, self.handler);
} else {
self.trigger('pgadmin-session:invalid', msg, self);
}
@ -516,9 +516,9 @@ function(_, pgAdmin, $, Backbone) {
}
var msg = null,
validate = function(m) {
if ('validate' in obj && typeof(obj.validate) == 'function') {
msg = obj.validate();
validate = function(m, attrs) {
if ('validate' in m && typeof(m.validate) == 'function') {
msg = m.validate(attrs);
return msg;
}
@ -543,11 +543,15 @@ function(_, pgAdmin, $, Backbone) {
}
/*
* We will trigger validation information
* The object is valid, but does this has any effect on parent?
* Let's validate this object itself, before making it clear.
*
* We will trigger validation information.
*/
if (_.size(self.errorModel.attributes) == 0) {
if (_.size(self.errorModel.attributes) == 0 &&
!validate(self, (objName && [objName]))) {
if (self.handler) {
(self.handler).trigger('pgadmin-session:model:valid', self);
(self.handler).trigger('pgadmin-session:model:valid', self, self.handler);
} else {
self.trigger(
'pgadmin-session:valid', self.sessChanged(), self
@ -558,7 +562,7 @@ function(_, pgAdmin, $, Backbone) {
if (self.handler) {
(self.handler).trigger(
'pgadmin-session:model:invalid', msg, self
'pgadmin-session:model:invalid', msg, self, self.handler
);
} else {
self.trigger('pgadmin-session:invalid', msg, self);
@ -694,7 +698,7 @@ function(_, pgAdmin, $, Backbone) {
// Inform the parent that - I am an invalid model.
if (self.handler) {
(self.handler).trigger('pgadmin-session:model:invalid', msg, self);
(self.handler).trigger('pgadmin-session:model:invalid', msg, self, self.handler);
} else {
self.trigger('pgadmin-session:invalid', msg, self);
}
@ -954,13 +958,13 @@ function(_, pgAdmin, $, Backbone) {
if (!msg) {
if (self.handler) {
self.handler.trigger('pgadmin-session:model:valid', self);
self.handler.trigger('pgadmin-session:model:valid', self, self.handler);
} else {
self.trigger('pgadmin-session:valid', self.sessChanged(), self);
}
} else {
if (self.handler) {
self.handler.trigger('pgadmin-session:model:invalid', msg, self);
self.handler.trigger('pgadmin-session:model:invalid', msg, self, self.handler);
} else {
self.trigger('pgadmin-session:invalid', msg, self);
}

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

@ -819,7 +819,7 @@
{
model: self.field.get('model'),
silent: true,
handler: self.model.handler || self.model,
handler: self.model,
top: self.model.top || self.model,
attrName: self.field.get('name')
});
@ -1099,10 +1099,10 @@
$(grid.body.$el.find($("tr.new"))).removeClass("new")
var m = new (data.model) (null, {
silent: true,
handler: self.model.handler || self.model,
handler: collection,
top: self.model.top || self.model,
node_info: self.model.node_info,
collection: collection
collection: collection,
node_info: self.model.node_info
});
collection.add(m);
@ -1251,7 +1251,7 @@
if (!collection) {
collection = new (pgBrowser.Node.Collection)(null, {
handler: self.model.handler || self,
model: data.model,
model: data.model, top: self.model.top || self.model,
silent: true
});
self.model.set(data.name, collection, {silent: true});