2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

to_node → clicked_node

Browse source
This commit is contained in:
Laura Klünder 2017-07-27 14:11:16 +02:00
parent 4fd1968ff7
commit e85b5682cb
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/c3nav/editor/views/edit.py
View file

@ -334,16 +334,16 @@ def list_objects(request, model=None, level=None, space=None, explicit_edit=Fals
return render(request, 'editor/list.html', ctx) return render(request, 'editor/list.html', ctx)
def connect_nodes(request, active_node, to_node, edge_settings_form, graph_editing_settings): def connect_nodes(request, active_node, clicked_node, edge_settings_form, graph_editing_settings):
connect_nodes_setting = graph_editing_settings['connect_nodes'] connect_nodes_setting = graph_editing_settings['connect_nodes']
create_existing_edge_setting = graph_editing_settings['create_existing_edge'] create_existing_edge_setting = graph_editing_settings['create_existing_edge']
after_connect_nodes_setting = graph_editing_settings['after_connect_nodes'] after_connect_nodes_setting = graph_editing_settings['after_connect_nodes']
new_connections = [] new_connections = []
if connect_nodes_setting in ('bidirectional', 'unidirectional', 'unidirectional_force'): if connect_nodes_setting in ('bidirectional', 'unidirectional', 'unidirectional_force'):
new_connections.append((active_node, to_node, False)) new_connections.append((active_node, clicked_node, False))
if connect_nodes_setting == 'bidirectional': if connect_nodes_setting == 'bidirectional':
new_connections.append((to_node, active_node, True)) new_connections.append((clicked_node, active_node, True))
if new_connections: if new_connections:
instance = edge_settings_form.instance instance = edge_settings_form.instance
@ -376,13 +376,13 @@ def connect_nodes(request, active_node, to_node, edge_settings_form, graph_editi
messages.success(request, _('Reverse edge overwritten.') if is_reverse else _('Edge overwritten.')) messages.success(request, _('Reverse edge overwritten.') if is_reverse else _('Edge overwritten.'))
if connect_nodes_setting in ('delete_unidirectional', 'delete_bidirectional'): if connect_nodes_setting in ('delete_unidirectional', 'delete_bidirectional'):
existing = active_node.edges_from_here.filter(to_node=to_node).first() existing = active_node.edges_from_here.filter(to_node=clicked_node).first()
if existing is not None: if existing is not None:
existing.delete() existing.delete()
messages.success(request, _('Edge deleted.')) messages.success(request, _('Edge deleted.'))
if connect_nodes_setting in ('unidirectional_force', 'delete_bidirectional'): if connect_nodes_setting in ('unidirectional_force', 'delete_bidirectional'):
existing = to_node.edges_from_here.filter(to_node=active_node).first() existing = clicked_node.edges_from_here.filter(to_node=active_node).first()
if existing is not None: if existing is not None:
existing.delete() existing.delete()
messages.success(request, _('Reverse edge deleted.')) messages.success(request, _('Reverse edge deleted.'))
@ -390,7 +390,7 @@ def connect_nodes(request, active_node, to_node, edge_settings_form, graph_editi
if after_connect_nodes_setting == 'reset': if after_connect_nodes_setting == 'reset':
return None, True return None, True
elif after_connect_nodes_setting == 'set_second_active': elif after_connect_nodes_setting == 'set_second_active':
return to_node, True return clicked_node, True
return active_node, False return active_node, False