8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-09 03:16:25 +00:00

Merge branch 'extension_del_error_message' into 'dev'

Error messages when extension deletion are now more verbose

See merge request re2o/re2o!544
This commit is contained in:
chirac 2020-06-09 23:48:59 +02:00
commit 755372b782
2 changed files with 230 additions and 225 deletions

File diff suppressed because it is too large Load diff

View file

@ -663,13 +663,17 @@ def del_extension(request, instances):
try: try:
extension_del.delete() extension_del.delete()
messages.success(request, _("The extension was deleted.")) messages.success(request, _("The extension was deleted."))
except ProtectedError: except ProtectedError as e:
messages.error( messages.error(
request, request,
( (
_( _(
"The extension %s is assigned to at least one machine" "The extension %s is assigned to following %s : %s"
" type, you can't delete it." % extension_del ", you can't delete it."
) % (
extension_del,
str(e.protected_objects.model._meta.verbose_name_plural),
",".join(map(lambda x: str(x['name']), e.protected_objects.values('name').iterator()))
) )
), ),
) )