From f74178f7203ff26cfacfa5c6dd5e24cc0681075d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Thu, 26 Dec 2024 05:41:28 +0100 Subject: [PATCH] Revert "use changesets in import management commands correctly" This reverts commit 5dc829e00812f9de78478daf3062f70b3bcacc2e. --- src/c3nav/mapdata/management/commands/importhub.py | 6 +++--- src/c3nav/mapdata/management/commands/importnoc.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/c3nav/mapdata/management/commands/importhub.py b/src/c3nav/mapdata/management/commands/importhub.py index 2f5f96a3..e5e67bde 100644 --- a/src/c3nav/mapdata/management/commands/importhub.py +++ b/src/c3nav/mapdata/management/commands/importhub.py @@ -45,12 +45,12 @@ class Command(BaseCommand): changed_geometries.reset() changeset = ChangeSet() + changeset.author = self.request.user changeset.title = 'importhub' with within_changeset(changeset=changeset, user=None) as locked_changeset: self.do_import(r.json()) - if locked_changeset.changes: - with locked_changeset.lock_to_edit() as locked_changeset: - locked_changeset.apply(user=None) + with changeset.lock_to_edit() as locked_changeset: + locked_changeset.apply(user=None) def do_report(self, prefix: str, obj_id: str, obj, report: Report): import_prefix = f"{prefix}:{obj_id}:" diff --git a/src/c3nav/mapdata/management/commands/importnoc.py b/src/c3nav/mapdata/management/commands/importnoc.py index f96c17a3..d709c504 100644 --- a/src/c3nav/mapdata/management/commands/importnoc.py +++ b/src/c3nav/mapdata/management/commands/importnoc.py @@ -38,12 +38,12 @@ class Command(BaseCommand): changed_geometries.reset() changeset = ChangeSet() + changeset.author = self.request.user changeset.title = 'importnoc' with within_changeset(changeset=changeset, user=None) as locked_changeset: self.do_import(items) - if locked_changeset.changes: - with locked_changeset.lock_to_edit() as locked_changeset: - locked_changeset.apply(user=None) + with changeset.lock_to_edit() as locked_changeset: + locked_changeset.apply(user=None) def do_report(self, prefix: str, obj_id: str, obj, report: Report): import_prefix = f"{prefix}:{obj_id}:"