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

fixes to make the last commit work (asside from applying changes)

Browse source
This commit is contained in:
Laura Klünder 2024-09-26 17:08:41 +02:00
parent 174866c2fd
commit f2f0b9fdae
7 changed files with 32 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/c3nav/editor/models/changeset.py
View file

@ -43,7 +43,8 @@ class ChangeSet(models.Model):
related_name='assigned_changesets', verbose_name=_('assigned to'))
map_update = models.OneToOneField(MapUpdate, null=True, related_name='changeset',
verbose_name=_('map update'), on_delete=models.PROTECT)
changes: ChangedObjectCollection = SchemaField(schema=ChangedObjectCollection, default=ChangedObjectCollection)
changes: ChangedObjectCollection = SchemaField(schema=ChangedObjectCollection,
default=lambda: ChangedObjectCollection)
class Meta:
verbose_name = _('Change Set')
@ -164,7 +165,7 @@ class ChangeSet(models.Model):
return self.can_edit(request) and self.state == 'unproposed'
def can_propose(self, request):
return self.can_edit(request) and not self.proposed and self.changes.operations
return self.can_edit(request) and not self.proposed and self.changes
def can_unpropose(self, request):
return self.author_id == request.user.pk and self.state in ('proposed', 'reproposed')
@ -347,8 +348,7 @@ class ChangeSet(models.Model):
"""
Get the number of changed objects.
"""
return len([changed_object for changed_object in self.changes.changed_objects
if changed_object.obj.model != "locationredirect"])
return len(self.changes)
def get_changed_objects_by_model(self, model):
if isinstance(model, str):