x/solar
Code Issues Proposed changes

Remove location_id/transports_id from disconnect

Browse Source
This commit is contained in:
Dmitry Shulyak 2015-11-17 11:43:35 +02:00
parent 637596343b
commit ac3cb4d6c0
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
solar/solar/core/resource/resource.py
View File

@ -288,7 +288,6 @@ class Resource(object):
def disconnect(self, receiver): def disconnect(self, receiver):
inputs = self.db_obj.inputs.keys() inputs = self.db_obj.inputs.keys()
inputs += ['location_id', 'transports_id']
self.db_obj.disconnect(other=receiver.db_obj, inputs=inputs) self.db_obj.disconnect(other=receiver.db_obj, inputs=inputs)
receiver.db_obj.save_lazy() receiver.db_obj.save_lazy()
self.db_obj.save_lazy() self.db_obj.save_lazy()

8
solar/solar/system_log/change.py
View File

@ -189,18 +189,18 @@ def _update_inputs_connections(res_obj, args, old_connections, new_connections):
if item not in old_connections: if item not in old_connections:
added.append(item) added.append(item)
if removed or added: for emitter, _, receiver, _ in removed:
emmiter_obj = resource.load(emitter) emmiter_obj = resource.load(emitter)
receiver_obj = resource.load(receiver) receiver_obj = resource.load(receiver)
for emitter, _, receiver, _ in removed:
emmiter_obj.disconnect(receiver_obj) emmiter_obj.disconnect(receiver_obj)
for emitter, emitter_input, receiver, receiver_input in added: for emitter, emitter_input, receiver, receiver_input in added:
emmiter_obj = resource.load(emitter)
receiver_obj = resource.load(receiver)
emmiter_obj.connect(receiver_obj, {emitter_input: receiver_input}) emmiter_obj.connect(receiver_obj, {emitter_input: receiver_input})
if removed or added: if removed or added:
# without save we will get error that some values can not be updated # TODO without save we will get error that some values can not be updated
# even if connection was removed # even if connection was removed
receiver_obj.db_obj.save() receiver_obj.db_obj.save()