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

Fixed the issue while parsing, and assigning the data properly in the Node.

pull/3/head
Ashesh Vashi 2015-12-17 16:13:36 +05:30
parent c796eee2a7
commit ca0b1f20df
2 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/pgadmin/browser/templates/browser/js/collection.js
View File

@ -43,7 +43,7 @@ function($, _, S, pgAdmin, Backbone, Alertify, Backform) {
node = pgBrowser.Nodes[that.node],
// This will be the URL, used for object manipulation.
urlBase = this.generate_url(item, 'properties', data),
collections = new (node.Collection.extend({
collection = new (node.Collection.extend({
url: urlBase,
model: node.model
}))(),
@ -54,7 +54,7 @@ function($, _, S, pgAdmin, Backbone, Alertify, Backform) {
// Initialize a new Grid instance
grid = new Backgrid.Grid({
columns: gridSchema.columns,
collection: collections,
collection: collection,
className: "backgrid table-bordered"
}),
gridView = {
@ -86,7 +86,7 @@ function($, _, S, pgAdmin, Backbone, Alertify, Backform) {
j.append(content);
// Fetch Data
collections.fetch({reset: true})
collection.fetch({reset: true})
.error(function(jqxhr, error, message) {
Alertify.pgNotifier(
error, jqxhr,
@ -99,7 +99,7 @@ function($, _, S, pgAdmin, Backbone, Alertify, Backform) {
generate_url: function(item, type, d) {
var url = pgAdmin.Browser.URL + '{TYPE}/{REDIRECT}{REF}',
/*
* Using list, and collections functions of a node to get the nodes
* Using list, and collection functions of a node to get the nodes
* under the collection, and properties of the collection respectively.
*/
opURL = {

34
web/pgadmin/browser/templates/browser/js/node.js
View File

@ -520,7 +520,7 @@ function($, _, S, pgAdmin, Menu, Backbone, Alertify, Backform) {
var b = $(tmpl(btn));
btnGroup.append(b);
// Register is a callback to set callback
// for certain operatio for this button.
// for certain operation for this button.
btn.register(b);
});
return btnGroup;
@ -1014,10 +1014,10 @@ function($, _, S, pgAdmin, Menu, Backbone, Alertify, Backform) {
var obj, val;
switch(s.type) {
case 'collection':
obj = self.get(s.name);
val = res[s.name];
obj = self.get(s.id);
val = res[s.id];
if (_.isArray(val) || _.isObject(val)) {
if (!obj || obj instanceof Backbone.Collection) {
if (!obj || !(obj instanceof Backbone.Collection)) {
obj = new (pgBrowser.Node.Collection)(val, {
model: ((_.isString(s.model) &&
s.model in pgBrowser.Nodes) ?
@ -1026,9 +1026,9 @@ function($, _, S, pgAdmin, Menu, Backbone, Alertify, Backform) {
parse: true,
silent: true
});
self.set(s.name, obj, {silent: true, parse: true});
self.set(s.id, obj, {silent: true, parse: true});
} else {
obj.reset(s.name, val, {silent: true, parse: true});
obj.reset(val, {silent: true, parse: true});
}
}
else {
@ -1036,11 +1036,12 @@ function($, _, S, pgAdmin, Menu, Backbone, Alertify, Backform) {
delete obj;
obj = null;
}
self.set(s.name, obj, {silent: true});
self.set(s.id, obj, {silent: true});
res[s.id] = obj;
break;
case 'model':
obj = self.get(s.name);
val = res[s.name];
obj = self.get(s.id);
val = res[s.id];
if (_.isArray(val) || _.isObject(val)) {
if (!_.isObject(obj)) {
if (_.isString(s.model) &&
@ -1052,13 +1053,14 @@ function($, _, S, pgAdmin, Menu, Backbone, Alertify, Backform) {
obj = new (s.model)(null, {handler: self.handler || self});
}
}
obj.set(self.get(s.name), {parse: true, silent: true});
obj.set(self.get(s.id), {parse: true, silent: true});
} else {
if (obj)
delete obj;
obj = null;
}
self.set(s.name, obj, {silent: true});
self.set(s.id, obj, {silent: true});
res[s.id] = obj;
break;
default:
break;
@ -1127,6 +1129,12 @@ function($, _, S, pgAdmin, Menu, Backbone, Alertify, Backform) {
onChange: function() {
var self = this;
if (self.validate && _.isFunction(self.validate)) {
if (!self.validate()) {
return false;
}
}
if (self.handler && 'onChange' in self.handler &&
_.isFunction(self.handler.onChange)) {
return self.handler.onChange();
@ -1201,7 +1209,9 @@ function($, _, S, pgAdmin, Menu, Backbone, Alertify, Backform) {
}
_.each(self.objects, function(o) {
res[o] = (self.get(o)).toJSON(session);
var obj = self.get(o);
if (session || obj)
res[o] = (obj && obj.toJSON(session));
});
return res;
},