Merge branch 'master' of github.com:pretix/pretix

src/pretix/control/templates/pretixcontrol/event/settings.html

@@ -28,7 +28,6 @@
 			<legend>{% trans "Presale settings" %}</legend>
 			{% bootstrap_field form.presale_start layout="horizontal" %}
 			{% bootstrap_field form.presale_end layout="horizontal" %}
-            {% bootstrap_field form.max_items_per_order layout="horizontal" %}
 		</fieldset>
 		<fieldset>
 			<legend>{% trans "Payment settings" %}</legend>

src/pretix/control/tests/test_auth.py

@@ -1,10 +1,9 @@
 from django.test import TestCase, Client
 
 from pretix.base.models import User
-from pretix.base.tests import BrowserTest, on_platforms
+from pretix.base.tests import BrowserTest
 
 
-@on_platforms()
 class LoginFormBrowserTest(BrowserTest):
 
     def setUp(self):

src/pretix/control/tests/test_events.py

@@ -1,9 +1,8 @@
 import datetime
 from pretix.base.models import User, Organizer, Event, OrganizerPermission, EventPermission
-from pretix.base.tests import BrowserTest, on_platforms
+from pretix.base.tests import BrowserTest
 
 
-@on_platforms()
 class EventsTest(BrowserTest):
 
     def setUp(self):

src/pretix/control/tests/test_items.py

@@ -5,7 +5,7 @@ import unittest
 from selenium.webdriver.support.select import Select
 from pretix.base.models import User, Organizer, Event, OrganizerPermission, EventPermission, ItemCategory, Property, \
     PropertyValue, Question, Quota, Item
-from pretix.base.tests import BrowserTest, on_platforms
+from pretix.base.tests import BrowserTest
 
 
 class ItemFormTest(BrowserTest):
@@ -30,18 +30,7 @@ class ItemFormTest(BrowserTest):
         self.driver.find_element_by_css_selector('button[type="submit"]').click()
         self.driver.find_element_by_class_name("navbar-right")
 
-    def scroll_into_view(self, element):
-        """Scroll element into view"""
-        y = element.location['y']
-        self.driver.execute_script('window.scrollTo(0, {0})'.format(y))
 
-    def scroll_and_click(self, element):
-        self.scroll_into_view(element)
-        time.sleep(0.5)
-        element.click()
-
-
-@on_platforms()
 class CategoriesTest(ItemFormTest):
 
     def test_create(self):
@@ -109,7 +98,6 @@ class CategoriesTest(ItemFormTest):
         self.assertNotIn("Entry tickets", self.driver.find_element_by_css_selector(".container table").text)
 
 
-@on_platforms()
 class PropertiesTest(ItemFormTest):
 
     def test_create(self):
@@ -156,7 +144,6 @@ class PropertiesTest(ItemFormTest):
         self.assertNotIn("Size", self.driver.find_element_by_css_selector(".container table").text)
 
 
-@on_platforms()
 class QuestionsTest(ItemFormTest):
 
     def test_create(self):
@@ -193,7 +180,6 @@ class QuestionsTest(ItemFormTest):
         self.assertNotIn("shoe size", self.driver.find_element_by_css_selector(".container table").text)
 
 
-@on_platforms()
 class QuotaTest(ItemFormTest):
 
     def test_create(self):

src/pretix/control/views/event.py

@@ -44,7 +44,6 @@ class EventUpdateForm(VersionedModelForm):
             'presale_end',
             'payment_term_days',
             'payment_term_last',
-            'max_items_per_order'
         ]
 
 

src/pretix/control/views/item.py

@@ -473,8 +473,6 @@ class QuotaForm(ModelForm):
         if self.instance.pk is not None and isinstance(self.instance, Versionable):
             if self.has_changed():
                 self.instance = self.instance.clone_shallow()
-                # TODO: order_cache, lock_cache are emptied by that but you'll have
-                #       to rebuild them anyway
         return super().save(commit)
 
     class Meta: