nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-09-19 04:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

snapshot: Show better error messages

Browse Source 
- Simplify success message for easy localization.

Tests:

- Update configuration notice the success message is shown properly.

- Insert errors in set_config() privileged method and notice that HTML error is
shown properly.

- Insert errors in privileged.delete() method, print 'Config is in use.' message
on stderr and notice that HTML error is shown properly.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Sunil Mohan Adapa 2024-03-18 14:43:34 -07:00 committed by James Valleroy
parent f240c4203c
commit 601b48d5b1
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
plinth/modules/snapshot/views.py
View File

@ -14,7 +14,7 @@ from django.utils.translation import gettext_lazy
from plinth import app as app_module from plinth import app as app_module
from plinth.modules import snapshot as snapshot_module from plinth.modules import snapshot as snapshot_module
from plinth.modules import storage from plinth.modules import storage
from plinth.views import AppView from plinth.views import AppView, messages_error
from . import get_configuration, privileged from . import get_configuration, privileged
from .forms import SnapshotForm from .forms import SnapshotForm
@ -155,13 +155,9 @@ def update_configuration(request, old_status, new_status):
try: try:
privileged.set_config(list(config)) privileged.set_config(list(config))
messages.success(request, _('Storage snapshots configuration updated')) messages.success(request, _('Configuration updated.'))
except Exception as exception: except Exception as exception:
messages.error( messages_error(request, _('Configuration update failed.'), exception)
request,
_('Action error: {0} [{1}] [{2}]').format(exception.args[0],
exception.args[1],
exception.args[2]))
def delete_selected(request): def delete_selected(request):
@ -187,13 +183,13 @@ def delete_selected(request):
messages.success(request, _('Deleted selected snapshots')) messages.success(request, _('Deleted selected snapshots'))
except Exception as exception: except Exception as exception:
if 'Config is in use.' in exception.args[2]: message = _('Deleting snapshot failed.')
messages.error( stderr = getattr(exception, 'stderr', b'').decode()
request, if 'Config is in use.' in stderr:
_('Snapshot is currently in use. ' message = _('Snapshot is currently in use. '
'Please try again later.')) 'Please try again later.')
else:
raise messages_error(request, message, exception)
return redirect(reverse('snapshot:manage')) return redirect(reverse('snapshot:manage'))