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

Revert "use changesets in import management commands correctly"

Browse source 
This reverts commit 5dc829e008.
This commit is contained in:
Laura Klünder 2024-12-26 05:41:28 +01:00
parent 94a8328cbb
commit f74178f720
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/c3nav/mapdata/management/commands/importhub.py
View file

@ -45,12 +45,12 @@ class Command(BaseCommand):
changed_geometries.reset() changed_geometries.reset()
changeset = ChangeSet() changeset = ChangeSet()
changeset.author = self.request.user
changeset.title = 'importhub' changeset.title = 'importhub'
with within_changeset(changeset=changeset, user=None) as locked_changeset: with within_changeset(changeset=changeset, user=None) as locked_changeset:
self.do_import(r.json()) self.do_import(r.json())
if locked_changeset.changes: with changeset.lock_to_edit() as locked_changeset:
with locked_changeset.lock_to_edit() as locked_changeset: locked_changeset.apply(user=None)
locked_changeset.apply(user=None)
def do_report(self, prefix: str, obj_id: str, obj, report: Report): def do_report(self, prefix: str, obj_id: str, obj, report: Report):
import_prefix = f"{prefix}:{obj_id}:" import_prefix = f"{prefix}:{obj_id}:"

6
src/c3nav/mapdata/management/commands/importnoc.py
View file

@ -38,12 +38,12 @@ class Command(BaseCommand):
changed_geometries.reset() changed_geometries.reset()
changeset = ChangeSet() changeset = ChangeSet()
changeset.author = self.request.user
changeset.title = 'importnoc' changeset.title = 'importnoc'
with within_changeset(changeset=changeset, user=None) as locked_changeset: with within_changeset(changeset=changeset, user=None) as locked_changeset:
self.do_import(items) self.do_import(items)
if locked_changeset.changes: with changeset.lock_to_edit() as locked_changeset:
with locked_changeset.lock_to_edit() as locked_changeset: locked_changeset.apply(user=None)
locked_changeset.apply(user=None)
def do_report(self, prefix: str, obj_id: str, obj, report: Report): def do_report(self, prefix: str, obj_id: str, obj, report: Report):
import_prefix = f"{prefix}:{obj_id}:" import_prefix = f"{prefix}:{obj_id}:"