CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Improve error messages when event or organizer can't be deleted (#3074)

Browse Source
This commit is contained in:
Raphael Michel
2023-02-01 11:43:07 +01:00
committed by GitHub
parent 4cad8eae93
commit afae6fdd45
2 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/pretix/control/views/event.py
View File

@@ -42,6 +42,7 @@ from itertools import groupby
from urllib.parse import urlsplit from urllib.parse import urlsplit
import bleach import bleach
from django.apps import apps
from django.conf import settings from django.conf import settings
from django.contrib import messages from django.contrib import messages
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
@@ -1025,9 +1026,27 @@ class EventDelete(RecentAuthenticationRequiredMixin, EventPermissionRequiredMixi
self.request.event.delete() self.request.event.delete()
messages.success(self.request, _('The event has been deleted.')) messages.success(self.request, _('The event has been deleted.'))
return redirect(self.get_success_url()) return redirect(self.get_success_url())
except ProtectedError: except ProtectedError as e:
messages.error(self.request, _('The event could not be deleted as some constraints (e.g. data created by ' err = gettext('The event could not be deleted as some constraints (e.g. data created by plug-ins) do not allow it.')
'plug-ins) do not allow it.'))
app_labels = set()
for e in e.protected_objects:
app_labels.add(type(e)._meta.app_label)
plugin_names = []
for app_label in app_labels:
app = apps.get_app_config(app_label)
if hasattr(app, 'PretixPluginMeta'):
plugin_names.append(str(app.PretixPluginMeta.name))
else:
plugin_names.append(str(app.verbose_name))
if plugin_names:
err += ' ' + gettext(
'Specifically, the following plugins still contain data depends on this event: {plugin_names}'
).format(plugin_names=', '.join(plugin_names))
messages.error(self.request, err)
return self.get(self.request, *self.args, **self.kwargs) return self.get(self.request, *self.args, **self.kwargs)
def get_success_url(self) -> str: def get_success_url(self) -> str:

20
src/pretix/control/views/organizer.py
View File

@@ -393,9 +393,23 @@ class OrganizerDelete(AdministratorPermissionRequiredMixin, FormView):
self.request.organizer.delete() self.request.organizer.delete()
messages.success(self.request, _('The organizer has been deleted.')) messages.success(self.request, _('The organizer has been deleted.'))
return redirect(self.get_success_url()) return redirect(self.get_success_url())
except ProtectedError: except ProtectedError as e:
messages.error(self.request, _('The organizer could not be deleted as some constraints (e.g. data created by ' err = gettext('The organizer could not be deleted as some constraints (e.g. data created by plug-ins) do not allow it.')
'plug-ins) do not allow it.'))
# Unlike deleting events (which is done by regular backend users), this feature can only be used by sysadmins,
# so we expose more technical / less polished information.
affected_models = set()
for m in e.protected_objects:
affected_models.add(type(m)._meta.label)
if affected_models:
err += ' ' + gettext(
'The following database models still contain data that cannot be deleted automatically: {affected_models}'
).format(
affected_models=', '.join(list(affected_models))
)
messages.error(self.request, err)
return self.get(self.request, *self.args, **self.kwargs) return self.get(self.request, *self.args, **self.kwargs)
def get_success_url(self) -> str: def get_success_url(self) -> str: