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

Moved property to the inside of items

Browse Source
This commit is contained in:
Raphael Michel
2015-10-08 12:45:19 +02:00
parent b99f541adf
commit 974c5cee79
25 changed files with 649 additions and 603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/tests/plugins/test_pretixdroid.py
View File

@@ -20,8 +20,7 @@ def env():
user = User.objects.create_user('dummy@dummy.dummy', 'dummy')
EventPermission.objects.create(user=user, event=event)
shirt = Item.objects.create(event=event, name='T-Shirt', default_price=12)
prop1 = Property.objects.create(event=event, name="Color")
shirt.properties.add(prop1)
prop1 = Property.objects.create(event=event, name="Color", item=shirt)
val1 = PropertyValue.objects.create(prop=prop1, value="Red", position=0)
val2 = PropertyValue.objects.create(prop=prop1, value="Black", position=1)
shirt_red = ItemVariation.objects.create(item=shirt, default_price=14)

6
src/tests/plugins/test_timerestriction.py
View File

@@ -217,7 +217,8 @@ class TimeRestrictionTest(TestCase):
self.assertFalse(result[0]['available'])
def test_variation_specific(self):
self.item.properties.add(self.property)
self.property.item = self.item
self.property.save()
r1 = TimeRestriction.objects.create(
timeframe_from=now() - timedelta(days=5),
@@ -242,7 +243,8 @@ class TimeRestrictionTest(TestCase):
self.assertTrue(v['available'])
def test_variation_specifics(self):
self.item.properties.add(self.property)
self.property.item = self.item
self.property.save()
r1 = TimeRestriction.objects.create(
timeframe_from=now() - timedelta(days=5),