diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/model/util.js | 7 | ||||
| -rw-r--r-- | src/server/db_op.py | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/client/model/util.js b/src/client/model/util.js index 7a74517f..b65ad313 100644 --- a/src/client/model/util.js +++ b/src/client/model/util.js @@ -63,13 +63,12 @@ define([ 'jquery', 'model/diff' ], function($, model_diff) { // type: // - discard all but first label // - adjust to lowercase - '__type' : __sanitize_label__read(l_raw['__type'][0]), + '__type' : __sanitize_label__read(l_raw['__type']), 'state' : 'perm', }, l_raw); ret['name'] = ret['__type']; - - delete ret.__label_set; + delete ret.__type; return ret; } @@ -83,7 +82,7 @@ define([ 'jquery', 'model/diff' ], function($, model_diff) { '__dst_id' : l_raw.target.id, }, l_raw); - ret['__type'] = [__sanitize_label__write(l_raw.__type)]; + ret['__type'] = __sanitize_label__write(l_raw.__type); delete ret.__dst; delete ret.__src; diff --git a/src/server/db_op.py b/src/server/db_op.py index 1b1e8993..54d2dfd5 100644 --- a/src/server/db_op.py +++ b/src/server/db_op.py @@ -584,9 +584,8 @@ class DBO_rz_clone(DB_op): """ clone rhizi - @return: a dict: {'node_set': n_set, - 'link_set': l_set } - where l_set is a list of (src.id, dst.id, link) tuples + @return: a Topo_Diff with the appropriate node_set_add, link_set_add + fields filled """ super(DBO_rz_clone, self).__init__() @@ -628,7 +627,7 @@ class DBO_rz_clone(DB_op): l = l_tuple[1] l['__src_id'] = n['id'] l['__dst_id'] = l_tuple[0] - l['__label_set'] = [l_tuple[2]] # box single value returned by type() + l['__type'] = l_tuple[2] ret_l_set.append(l) |