nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-05-20 10:34:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

middleware: Skip 'installed' message for essential apps

Browse Source 
Closes #1085.

Signed-off-by: James Valleroy <jvalleroy@mailbox.org>
Reviewed-by: Joseph Nuthalapati <njoseph@thoughtworks.com>
This commit is contained in:
James Valleroy 2018-03-30 07:44:00 -04:00 committed by Joseph Nuthalapati
parent 9b8ef7223a
commit 2ea575806d
No known key found for this signature in database
GPG Key ID: 5398F00A2FA43C35
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plinth/middleware.py
View File

@ -69,7 +69,8 @@ class SetupMiddleware(MiddlewareMixin):
if module.setup_helper.is_finished: if module.setup_helper.is_finished:
exception = module.setup_helper.collect_result() exception = module.setup_helper.collect_result()
if not exception: if not exception:
messages.success(request, _('Application installed.')) if not setup._is_module_essential(module):
messages.success(request, _('Application installed.'))
else: else:
if isinstance(exception, PackageException): if isinstance(exception, PackageException):
error_string = getattr(exception, 'error_string', error_string = getattr(exception, 'error_string',

1
plinth/tests/test_middleware.py
View File

@ -122,6 +122,7 @@ class TestSetupMiddleware(TestCase):
"""Test that module installation result is collected properly.""" """Test that module installation result is collected properly."""
resolve.return_value.namespaces = ['mockapp'] resolve.return_value.namespaces = ['mockapp']
module = Mock() module = Mock()
module.is_essential = False
module.setup_helper.is_finished = True module.setup_helper.is_finished = True
module.setup_helper.collect_result.return_value = None module.setup_helper.collect_result.return_value = None
module.setup_helper.get_state.return_value = 'up-to-date' module.setup_helper.get_state.return_value = 'up-to-date'