From de37888d507b0cfe991a057434a406018035621a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Thu, 21 Nov 2024 21:14:20 +0100 Subject: [PATCH] =?UTF-8?q?some=20more=20fixing,=20activating=20a=20change?= =?UTF-8?q?set=20seems=20to=20work=20now=E2=80=A6=20ish?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/c3nav/editor/changes.py | 5 +++-- src/c3nav/editor/operations.py | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/c3nav/editor/changes.py b/src/c3nav/editor/changes.py index 649e7a6c..7aad6644 100644 --- a/src/c3nav/editor/changes.py +++ b/src/c3nav/editor/changes.py @@ -589,10 +589,11 @@ class ChangedObjectCollection(BaseSchema): ended_situations.append(situation) if done_situation: - return DatabaseOperationCollection( + result = DatabaseOperationCollection( prev=self.prev, - _operations=done_situation.operations, ) + result.extend(done_situation.operations) + return result # todo: what to do if we can't fully solve it? raise NotImplementedError('couldnt fully solve as_operations') diff --git a/src/c3nav/editor/operations.py b/src/c3nav/editor/operations.py index d3ead736..f97b2cd7 100644 --- a/src/c3nav/editor/operations.py +++ b/src/c3nav/editor/operations.py @@ -203,6 +203,9 @@ class DatabaseOperationCollection(BaseSchema): def __len__(self): return len(self._operations) + def extend(self, items: list[DatabaseOperation]): + self._operations.extend(items) + def append(self, item: DatabaseOperation): self._operations.append(item)