diff options
| author | LV-426 <lv-426@taproot.org.il> | 2015-01-06 15:05:40 +0200 |
|---|---|---|
| committer | LV-426 <lv-426@taproot.org.il> | 2015-01-06 17:30:14 +0200 |
| commit | ad1361e40fda170b8a5ca441fcc4351fb9d95838 (patch) | |
| tree | 77342cfa6036b3bd4eb44f5a2f2fde087705614e /src | |
| parent | b4d9dadcdc5351d188e06c59eab038576b59a5ef (diff) | |
used meta_attr='__type' for links (nodes still use '__label_set')
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/model/util.js | 4 | ||||
| -rw-r--r-- | src/server/db_op.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/client/model/util.js b/src/client/model/util.js index 20472fda..7a74517f 100644 --- a/src/client/model/util.js +++ b/src/client/model/util.js @@ -63,7 +63,7 @@ define([ 'jquery', 'model/diff' ], function($, model_diff) { // type: // - discard all but first label // - adjust to lowercase - '__type' : __sanitize_label__read(l_raw['__label_set'][0]), + '__type' : __sanitize_label__read(l_raw['__type'][0]), 'state' : 'perm', }, l_raw); @@ -83,7 +83,7 @@ define([ 'jquery', 'model/diff' ], function($, model_diff) { '__dst_id' : l_raw.target.id, }, l_raw); - ret['__label_set'] = [__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 26f2518b..c1327d9a 100644 --- a/src/server/db_op.py +++ b/src/server/db_op.py @@ -242,7 +242,7 @@ class DBO_diff_commit__topo(DB_composed_op): super(DBO_diff_commit__topo, self).__init__() n_add_map = db_util.meta_attr_list_to_meta_attr_map(topo_diff.node_set_add) - l_add_map = db_util.meta_attr_list_to_meta_attr_map(topo_diff.link_set_add) + l_add_map = db_util.meta_attr_list_to_meta_attr_map(topo_diff.link_set_add, meta_attr='__type') l_rm_set = topo_diff.link_set_rm n_rm_set = topo_diff.node_set_rm |