CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-09 15:54:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove field Seat.name

Browse Source
This commit is contained in:
Raphael Michel
2020-08-24 11:59:54 +02:00
parent 983d734c6a
commit 5ea961819d
3 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/pretix/base/migrations/0162_remove_seat_name.py Normal file
View File

@@ -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',
),
]

8
src/pretix/base/models/seating.py
View File

@@ -42,7 +42,7 @@ class SeatingPlan(LoggedModel):
layout = models.TextField(validators=[SeatingPlanLayoutValidator()]) layout = models.TextField(validators=[SeatingPlanLayoutValidator()])
Category = namedtuple('Categrory', 'name') 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): def __str__(self):
return self.name return self.name
@@ -95,7 +95,6 @@ class SeatingPlan(LoggedModel):
yield self.RawSeat( yield self.RawSeat(
number=s['seat_number'], number=s['seat_number'],
guid=s['seat_guid'], guid=s['seat_guid'],
name='{} {}'.format(r['row_number'], s['seat_number']), # TODO: Zone? Variable scheme?
row=r['row_number'], row=r['row_number'],
row_label=row_label, row_label=row_label,
seat_label=seat_label, seat_label=seat_label,
@@ -125,7 +124,6 @@ class Seat(models.Model):
""" """
event = models.ForeignKey(Event, related_name='seats', on_delete=models.CASCADE) 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) 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="") zone_name = models.CharField(max_length=190, blank=True, default="")
row_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) row_label = models.CharField(max_length=190, null=True)
@@ -141,6 +139,10 @@ class Seat(models.Model):
class Meta: class Meta:
ordering = ['sorting_rank', 'seat_guid'] ordering = ['sorting_rank', 'seat_guid']
@property
def name(self):
return str(self)
def __str__(self): def __str__(self):
parts = [] parts = []
if self.zone_name: if self.zone_name:

2
src/pretix/base/services/seating.py
View File

@@ -60,7 +60,6 @@ def generate_seats(event, subevent, plan, mapping):
seat = current_seats.pop(ss.guid) seat = current_seats.pop(ss.guid)
updated = any([ updated = any([
update(seat, 'product', p), update(seat, 'product', p),
update(seat, 'name', ss.name),
update(seat, 'row_name', ss.row), update(seat, 'row_name', ss.row),
update(seat, 'seat_number', ss.number), update(seat, 'seat_number', ss.number),
update(seat, 'zone_name', ss.zone), update(seat, 'zone_name', ss.zone),
@@ -77,7 +76,6 @@ def generate_seats(event, subevent, plan, mapping):
event=event, event=event,
subevent=subevent, subevent=subevent,
seat_guid=ss.guid, seat_guid=ss.guid,
name=ss.name,
row_name=ss.row, row_name=ss.row,
seat_number=ss.number, seat_number=ss.number,
zone_name=ss.zone, zone_name=ss.zone,