Fix failing tests

pyproject.toml

@@ -42,7 +42,7 @@ dependencies = [
   "django-filter==25.1",
   "django-formset-js-improved==0.5.0.3",
   "django-formtools==2.5.1",
-  "django-hierarkey==2.0.*,>=2.0.1",
+  "django-hierarkey==2.0.*",
   "django-hijack==3.7.*",
   "django-i18nfield==1.10.*",
   "django-libsass==0.9",

src/pretix/__init__.py

@@ -19,4 +19,4 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-__version__ = "2025.7.1"
+__version__ = "2025.8.0.dev0"

src/pretix/control/templates/pretixcontrol/organizers/plugins.html

@@ -69,36 +69,34 @@
                                                 {% if show_meta %}
                                                     <span class="text-muted text-sm">{{ plugin.version }}</span>
                                                 {% endif %}
-                                                {% if is_active or plugin.level == "event" %}
-                                                    {% if plugin.level == "organizer" %}
-                                                        <span class="label label-success" data-is-active>
-                                                            <span class="fa fa-check" aria-hidden="true"></span>
-                                                            {% trans "Active" %}
-                                                        </span>
-                                                    {% elif events_total and events_counter == events_total %}
-                                                        <span class="label label-success" data-is-active>
-                                                            <span class="fa fa-check" aria-hidden="true"></span>
-                                                            {% trans "Active (all events)" %}
-                                                        </span>
-                                                    {% elif events_counter %}
-                                                        <span class="label label-info" data-is-active>
-                                                            <span class="fa fa-check" aria-hidden="true"></span>
-                                                            {% blocktrans trimmed count count=events_counter %}
-                                                                Active ({{ count }} event)
-                                                            {% plural %}
-                                                                Active ({{ count }} events)
-                                                            {% endblocktrans %}
-                                                        </span>
-                                                    {% elif level == "event_organizer" %}
-                                                        <span class="label label-info" data-is-active>
-                                                            <span class="fa fa-check" aria-hidden="true"></span>
-                                                            {% blocktrans trimmed count count=0 %}
-                                                                Active ({{ count }} event)
-                                                            {% plural %}
-                                                                Active ({{ count }} events)
-                                                            {% endblocktrans %}
-                                                        </span>
-                                                    {% endif %}
+                                                {% if is_active and level == "organizer" %}
+                                                    <span class="label label-success" data-is-active>
+                                                        <span class="fa fa-check" aria-hidden="true"></span>
+                                                        {% trans "Active" %}
+                                                    </span>
+                                                {% elif events_counter == events_total %}
+                                                    <span class="label label-success" data-is-active>
+                                                        <span class="fa fa-check" aria-hidden="true"></span>
+                                                        {% trans "Active (all events)" %}
+                                                    </span>
+                                                {% elif events_counter %}
+                                                    <span class="label label-info" data-is-active>
+                                                        <span class="fa fa-check" aria-hidden="true"></span>
+                                                        {% blocktrans trimmed count count=events_counter %}
+                                                            Active ({{ count }} event)
+                                                        {% plural %}
+                                                            Active ({{ count }} events)
+                                                        {% endblocktrans %}
+                                                    </span>
+                                                {% elif level == "event_organizer" %}
+                                                    <span class="label label-info" data-is-active>
+                                                        <span class="fa fa-check" aria-hidden="true"></span>
+                                                        {% blocktrans trimmed count count=0 %}
+                                                            Active ({{ count }} event)
+                                                        {% plural %}
+                                                            Active ({{ count }} events)
+                                                        {% endblocktrans %}
+                                                    </span>
                                                 {% endif %}
                                             </h4>
                                             {% include "pretixcontrol/event/fragment_plugin_description.html" with plugin=plugin %}

src/tests/plugins/banktransfer/test_actions.py

@@ -35,7 +35,7 @@ from pretix.plugins.banktransfer.models import BankImportJob, BankTransaction
 
 @pytest.fixture
 def env():
-    o = Organizer.objects.create(name='Dummy', slug='dummy')
+    o = Organizer.objects.create(name='Dummy', slug='dummy', plugins='pretix.plugins.banktransfer')
     event = Event.objects.create(
         organizer=o, name='Dummy', slug='dummy',
         date_from=now(), plugins='pretix.plugins.banktransfer'

src/tests/plugins/banktransfer/test_api.py

@@ -36,7 +36,7 @@ from pretix.plugins.banktransfer.models import BankImportJob, BankTransaction
 
 @pytest.fixture
 def env():
-    o = Organizer.objects.create(name='Dummy', slug='dummy')
+    o = Organizer.objects.create(name='Dummy', slug='dummy', plugins='pretix.plugins.banktransfer')
     event = Event.objects.create(
         organizer=o, name='Dummy', slug='dummy',
         date_from=now(), plugins='pretix.plugins.banktransfer'

src/tests/plugins/banktransfer/test_import.py

@@ -53,7 +53,7 @@ from pretix.plugins.banktransfer.tasks import process_banktransfers
 
 @pytest.fixture
 def env():
-    o = Organizer.objects.create(name='Dummy', slug='dummy')
+    o = Organizer.objects.create(name='Dummy', slug='dummy', plugins='pretix.plugins.banktransfer')
     event = Event.objects.create(
         organizer=o, name='Dummy', slug='dummy',
         date_from=now(), plugins='pretix.plugins.banktransfer,pretix.plugins.paypal'

src/tests/plugins/banktransfer/test_refund.py

@@ -34,7 +34,7 @@ from pretix.base.models import (
 
 @pytest.fixture
 def env():
-    o = Organizer.objects.create(name='Dummy', slug='dummy')
+    o = Organizer.objects.create(name='Dummy', slug='dummy', plugins='pretix.plugins.banktransfer')
     event = Event.objects.create(
         organizer=o, name='Dummy', slug='dummy',
         date_from=now(), plugins='pretix.plugins.banktransfer,pretix.plugins.paypal'

src/tests/plugins/banktransfer/test_refund_export.py

@@ -35,7 +35,7 @@ from pretix.plugins.banktransfer.views import (
 
 @pytest.fixture
 def env():
-    o = Organizer.objects.create(name='Dummy', slug='dummy')
+    o = Organizer.objects.create(name='Dummy', slug='dummy', plugins='pretix.plugins.banktransfer')
     event = Event.objects.create(
         organizer=o, name='Dummy', slug='dummy',
         date_from=now(), plugins='pretix.plugins.banktransfer,pretix.plugins.paypal'