diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/model/core.js | 14 | ||||
| -rw-r--r-- | src/client/view/node_info.js | 2 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/client/model/core.js b/src/client/model/core.js index 2fee5629..2eeff72f 100644 --- a/src/client/model/core.js +++ b/src/client/model/core.js @@ -64,30 +64,36 @@ define(['util'], function(util) { // reuse id if present __set_obj_id(ret, node_spec.id); } + delete node_spec.id; util.assert(undefined != node_spec.name, 'create_node_from_spec: name missing'); ret.name = node_spec.name; + delete node_spec.name; // type if (undefined == node_spec.type) { console.debug('create_node_from_spec: undefined type, falling back to \'perm\''); node_spec.type = 'perm'; } + delete node_spec.state; ret.type = node_spec.type; + delete node_spec.type // status ret.status = node_spec.status || 'unknown'; + delete node_spec.status; // visual ret.x = node_spec.x; ret.y = node_spec.y; + delete node_spec.x; + delete node_spec.y; // other - ret.state = node_spec.state; - ret.url = node_spec.url; - ret.start = node_spec.start; - ret.end = node_spec.end; + for (var property in node_spec) { + ret[property] = node_spec[property]; + } return ret; } diff --git a/src/client/view/node_info.js b/src/client/view/node_info.js index 6599ed8b..9393d9e1 100644 --- a/src/client/view/node_info.js +++ b/src/client/view/node_info.js @@ -67,7 +67,7 @@ function show(d) { dayNamesMin: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'], }); - $('#editdescription').val(d.type); + $('#editdescription').val(d.description); $('#edittype').val(d.type); $('#editurl').val(d.url); $('#editstatus').val(d.status); |