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

Initialize and parse the neseted schema too.

Browse Source 
Renamed the type of the nested schema type to 'nested' from 'uiLayout'
to be more relatevant.
This commit is contained in:
Ashesh Vashi 2016-01-19 17:53:33 +05:30
parent 7c9347873f
commit 0cea682e88
2 changed files with 136 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,71 +13,80 @@ function(_, pgAdmin, $, Backbone) {
self.tnode = _.extend({}, res.node);
delete res.node;
}
if (self.schema && _.isArray(self.schema)) {
_.each(self.schema, function(s) {
var obj, val;
switch(s.type) {
case 'collection':
obj = self.get(s.id);
val = res[s.id];
if (_.isArray(val) || _.isObject(val)) {
if (!obj || !(obj instanceof Backbone.Collection)) {
obj = new (pgBrowser.Node.Collection)(val, {
model: ((_.isString(s.model) &&
s.model in pgBrowser.Nodes) ?
pgBrowser.Nodes[s.model].model : s.model),
top: self.top || self,
handler: self,
parse: true,
silent: true,
attrName: s.id
});
self.set(s.id, obj, {silent: true, parse: true});
} else {
obj.reset(val, {silent: true, parse: true});
}
}
else {
if (obj)
delete obj;
obj = null;
}
self.set(s.id, obj, {silent: true});
res[s.id] = obj;
break;
case 'model':
obj = self.get(s.id);
val = res[s.id];
if (!_.isUndefined(val) && !_.isNull(val)) {
if (!obj || !(obj instanceof Backbone.Model)) {
if (_.isString(s.model) &&
s.model in pgBrowser.Nodes[s.model]) {
obj = new (pgBrowser.Nodes[s.model].Model)(
obj, {
silent: true, top: self.top || self, handler: self,
attrName: s.id
}
);
} else {
obj = new (s.model)(obj, {
silent: true, top: self.top || self, handler: self,
var objectOp = function(schema) {
if (schema && _.isArray(schema)) {
_.each(schema, function(s) {
var obj, val;
switch(s.type) {
case 'collection':
obj = self.get(s.id);
val = res[s.id];
if (_.isArray(val) || _.isObject(val)) {
if (!obj || !(obj instanceof Backbone.Collection)) {
obj = new (pgBrowser.Node.Collection)(val, {
model: ((_.isString(s.model) &&
s.model in pgBrowser.Nodes) ?
pgBrowser.Nodes[s.model].model : s.model),
top: self.top || self,
handler: self,
parse: true,
silent: true,
attrName: s.id
});
});
self.set(s.id, obj, {silent: true, parse: true});
} else {
obj.reset(val, {silent: true, parse: true});
}
}
obj.set(val, {parse: true, silent: true});
} else {
if (obj)
delete obj;
obj = null;
}
res[s.id] = obj;
break;
default:
break;
}
});
}
else {
if (obj)
delete obj;
obj = null;
}
self.set(s.id, obj, {silent: true});
res[s.id] = obj;
break;
case 'model':
obj = self.get(s.id);
val = res[s.id];
if (!_.isUndefined(val) && !_.isNull(val)) {
if (!obj || !(obj instanceof Backbone.Model)) {
if (_.isString(s.model) &&
s.model in pgBrowser.Nodes[s.model]) {
obj = new (pgBrowser.Nodes[s.model].Model)(
obj, {
silent: true, top: self.top || self, handler: self,
attrName: s.id
}
);
} else {
obj = new (s.model)(obj, {
silent: true, top: self.top || self, handler: self,
attrName: s.id
});
}
}
obj.set(val, {parse: true, silent: true});
} else {
if (obj)
delete obj;
obj = null;
}
res[s.id] = obj;
break;
case 'nested':
objectOp(s.schema);
break;
default:
break;
}
});
}
};
objectOp(self.schema);
return res;
},
primary_key: function() {
@ -113,56 +122,72 @@ function(_, pgAdmin, $, Backbone) {
self.errorModel = new Backbone.Model();
self.node_info = options.node_info;
if (self.schema && _.isArray(self.schema)) {
_.each(self.schema, function(s) {
var obj = self.get(s.id);
switch(s.type) {
case 'collection':
if (!obj || !(obj instanceof pgBrowser.Node.Collection)) {
if (_.isString(s.model) &&
s.model in pgBrowser.Nodes) {
var node = pgBrowser.Nodes[s.model];
obj = new (node.Collection)(obj, {
model: node.model,
top: self.top || self,
handler: self,
attrName: s.id
});
} else {
obj = new (pgBrowser.Node.Collection)(obj, {
model: s.model,
top: self.top || self,
handler: self,
attrName: s.id
});
var obj;
var objectOp = function(schema) {
if (schema && _.isArray(schema)) {
_.each(schema, function(s) {
switch(s.type) {
case 'collection':
obj = self.get(s.id)
if (!obj || !(obj instanceof pgBrowser.Node.Collection)) {
if (_.isString(s.model) &&
s.model in pgBrowser.Nodes) {
var node = pgBrowser.Nodes[s.model];
obj = new (node.Collection)(obj, {
model: node.model,
top: self.top || self,
handler: self,
attrName: s.id
});
} else {
obj = new (pgBrowser.Node.Collection)(obj, {
model: s.model,
top: self.top || self,
handler: self,
attrName: s.id
});
}
}
}
break;
case 'model':
if (!obj || !(obj instanceof Backbone.Model)) {
if (_.isString(s.model) &&
s.model in pgBrowser.Nodes[s.model]) {
obj = new (pgBrowser.Nodes[s.model].Model)(
obj, {
top: self.top || self, handler: self, attrName: s.id
}
);
} else {
obj = new (s.model)(
obj, {
top: self.top || self, handler: self, attrName: s.id
});
obj.name = s.id;
self.objects.push(s.id);
self.set(s.id, obj, {silent: true});
break;
case 'model':
obj = self.get(s.id)
if (!obj || !(obj instanceof Backbone.Model)) {
if (_.isString(s.model) &&
s.model in pgBrowser.Nodes[s.model]) {
obj = new (pgBrowser.Nodes[s.model].Model)(
obj, {
top: self.top || self, handler: self, attrName: s.id
}
);
} else {
obj = new (s.model)(
obj, {
top: self.top || self, handler: self, attrName: s.id
});
}
}
}
break;
default:
return;
}
obj.name = s.id;
self.objects.push(s.id);
self.set(s.id, obj, {silent: true});
});
}
obj.name = s.id;
self.objects.push(s.id);
self.set(s.id, obj, {silent: true});
break;
case 'nested':
objectOp(s.schema);
break;
default:
return;
}
});
}
};
objectOp(self.schema);
if (self.handler && self.handler.trackChanges) {
self.startNewSession();

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

@ -1315,7 +1315,7 @@
// utilizing it later.
groups[group].push(o);
if (s.type == 'uiLayout') {
if (s.type == 'nested') {
delete o.name;
delete o.cell;