openstack
/
fuel-web
Code Issues Proposed changes

Add release roles to sample environment, create release models on client side

This commit is contained in:
Vitaly Kramskikh 2012-06-15 20:48:23 +04:00
parent 191ba58c6b
commit ebfd66422a
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nailgun/nailgun/fixtures/sample_environment.json
View File

@ -5,7 +5,11 @@
"fields": {
"name": "Essex",
"version": "1.2.3",
"description": "Essex release description"
"description": "Essex release description",
"roles": [
1,
2
]
}
},
{

22
nailgun/nailgun/static/js/models.js
View File

@ -10,9 +10,7 @@ define(function() {
description: null
},
initialize: function(attrs) {
if (_.isObject(attrs) && _.isArray(attrs.roles)) {
this.set('roles', new models.Roles(attrs.roles));
}
this.set('roles', new models.Roles(attrs.roles));
}
});
@ -26,15 +24,9 @@ define(function() {
defaults: {
name: null
},
initialize: function(attrs) {
if (_.isObject(attrs) && _.isArray(attrs.nodes)) {
this.set('nodes', new models.Nodes(attrs.nodes));
}
},
parse: function(response) {
if (_.isObject(response) && _.isArray(response.nodes)) {
response.nodes = new models.Nodes(response.nodes);
}
response.nodes = new models.Nodes(response.nodes);
response.release = new models.Release(response.release);
return response;
}
});
@ -52,9 +44,7 @@ define(function() {
metadata: null
},
initialize: function(attrs) {
if (_.isObject(attrs) && _.isArray(attrs.roles)) {
this.set('roles', new models.Roles(attrs.roles));
}
this.set('roles', new models.Roles(attrs.roles));
}
});
@ -73,9 +63,7 @@ define(function() {
version: null
},
initialize: function(attrs) {
if (_.isObject(attrs) && _.isArray(attrs.roles)) {
this.set('roles', new models.Roles(attrs.roles));
}
this.set('roles', new models.Roles(attrs.roles));
}
});