diff --git a/src/pretix/base/migrations/0162_remove_seat_name.py b/src/pretix/base/migrations/0162_remove_seat_name.py new file mode 100644 index 0000000000..163e90e4e6 --- /dev/null +++ b/src/pretix/base/migrations/0162_remove_seat_name.py @@ -0,0 +1,17 @@ +# Generated by Django 3.0.9 on 2020-08-24 07:29 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('pretixbase', '0161_order_changes_retain_old_default'), + ] + + operations = [ + migrations.RemoveField( + model_name='seat', + name='name', + ), + ] diff --git a/src/pretix/base/models/seating.py b/src/pretix/base/models/seating.py index 55b22209b3..e50f499717 100644 --- a/src/pretix/base/models/seating.py +++ b/src/pretix/base/models/seating.py @@ -42,7 +42,7 @@ class SeatingPlan(LoggedModel): layout = models.TextField(validators=[SeatingPlanLayoutValidator()]) Category = namedtuple('Categrory', 'name') - RawSeat = namedtuple('Seat', 'name guid number row category zone sorting_rank row_label seat_label x y') + RawSeat = namedtuple('Seat', 'guid number row category zone sorting_rank row_label seat_label x y') def __str__(self): return self.name @@ -95,7 +95,6 @@ class SeatingPlan(LoggedModel): yield self.RawSeat( number=s['seat_number'], guid=s['seat_guid'], - name='{} {}'.format(r['row_number'], s['seat_number']), # TODO: Zone? Variable scheme? row=r['row_number'], row_label=row_label, seat_label=seat_label, @@ -125,7 +124,6 @@ class Seat(models.Model): """ event = models.ForeignKey(Event, related_name='seats', on_delete=models.CASCADE) subevent = models.ForeignKey(SubEvent, null=True, blank=True, related_name='seats', on_delete=models.CASCADE) - name = models.CharField(max_length=190) zone_name = models.CharField(max_length=190, blank=True, default="") row_name = models.CharField(max_length=190, blank=True, default="") row_label = models.CharField(max_length=190, null=True) @@ -141,6 +139,10 @@ class Seat(models.Model): class Meta: ordering = ['sorting_rank', 'seat_guid'] + @property + def name(self): + return str(self) + def __str__(self): parts = [] if self.zone_name: diff --git a/src/pretix/base/services/seating.py b/src/pretix/base/services/seating.py index ccc0e9b167..018a4af087 100644 --- a/src/pretix/base/services/seating.py +++ b/src/pretix/base/services/seating.py @@ -60,7 +60,6 @@ def generate_seats(event, subevent, plan, mapping): seat = current_seats.pop(ss.guid) updated = any([ update(seat, 'product', p), - update(seat, 'name', ss.name), update(seat, 'row_name', ss.row), update(seat, 'seat_number', ss.number), update(seat, 'zone_name', ss.zone), @@ -77,7 +76,6 @@ def generate_seats(event, subevent, plan, mapping): event=event, subevent=subevent, seat_guid=ss.guid, - name=ss.name, row_name=ss.row, seat_number=ss.number, zone_name=ss.zone,