pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added support for 'array' type in the schema of Node model to treat as 

an object, and handle it well in the toJSON(..) with session
transformation.
pull/3/head
Ashesh Vashi 2016-04-06 15:05:36 +05:30
parent 01d6b46838
commit 1ba0814377
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -128,6 +128,10 @@ function(_, pgAdmin, $, Backbone) {
_.each(schema, function(s) {
switch(s.type) {
case 'array':
self.objects.push(s.id);
break;
case 'collection':
obj = self.get(s.id)
if (!obj || !(obj instanceof pgBrowser.Node.Collection)) {
@ -324,7 +328,9 @@ function(_, pgAdmin, $, Backbone) {
* transformed to JSON data.
*/
if (session) {
if ((obj.sessChanged && obj.sessChanged()) || isNew) {
if (res[k] instanceof Array) {
res[k] = JSON.stringify(res[k]);
} else if ((obj.sessChanged && obj.sessChanged()) || isNew) {
res[k] = obj && obj.toJSON(!isNew);
/*
* We will run JSON.stringify(..) only from the main object,
@ -340,7 +346,7 @@ function(_, pgAdmin, $, Backbone) {
} else {
delete res[k];
}
} else {
} else if (!(res[k] instanceof Array)) {
res[k] = (obj && obj.toJSON());
}
});