Compare commits

...

3 Commits

Author SHA1 Message Date
Raphael Michel
2d42c1f166 Bump to 2025.7.1 2025-08-23 10:15:29 +02:00
Raphael Michel
e4b8c5da25 Bump hierarkey to 2.0.1 2025-08-23 09:14:06 +02:00
luelista
c85b496187 Organizer plugins: Do not show plugins as active if they are inactive on org-level (#5396) 2025-08-23 09:13:56 +02:00
3 changed files with 32 additions and 30 deletions

View File

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

View File

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

View File

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