summaryrefslogtreecommitdiff
path: root/src/server/model
diff options
context:
space:
mode:
authorAlon Levy <alon@pobox.com>2014-12-30 10:31:39 +0200
committerAlon Levy <alon@pobox.com>2015-01-05 13:23:57 +0200
commit54aa65a3dab029f28741875eb11a40adb06aff51 (patch)
tree872e9c2723644795d5ac633ec9ae7820f8e3f69d /src/server/model
parente1203339003c32eb646b199d2ae69b7082228cc9 (diff)
introduce commit_and_tx_diff__topo & commit_diff__topo
Multiple fixes / changes. _bugs introduced_ Changes: graph has two change functions (i.e. the internal API): - commit_and_tx_diff_topo This currently transmits, later will optimistically apply first - commit_diff__topo This only applies. Used on the ajax success path for commit_and_tx_diff__topo and when changes are only local. It signals on the diffBus - diffBus - a Bacon.Bus that all UI listens to - selection UI - node/link dialogs - main view (rz_core/update_view__graph) Small changes: whitespace rename filer->filter Completely broken: - text entry. should use commit_diff__topo Problems introduced: selection doesn't work correctly. editing not verified yet
Diffstat (limited to 'src/server/model')
-rw-r--r--src/server/model/graph.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/model/graph.py b/src/server/model/graph.py
index 87c0a8b0..76368a24 100644
--- a/src/server/model/graph.py
+++ b/src/server/model/graph.py
@@ -106,9 +106,9 @@ class Topo_Diff(object):
def to_json_dict(self):
ret = {k: getattr(self, k) for k in ['link_set_rm',
- 'node_set_rm',
- 'node_set_add',
- 'link_set_add'] }
+ 'node_set_rm',
+ 'node_set_add',
+ 'link_set_add'] }
return ret
def __init__(self, link_set_rm=[],