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

upgrades: Minor fixes

Browse Source 
- Show error message based on return code rather than messages in
  stderr.

- Don't decorate the message paragraph with alert color, we are already
  doing that by showing a message at the top.

- Untabify.

- Improve message showing that upgrades are running, gramatically.

- Show errors messages decorated as errors.

- Minor cleanups.
This commit is contained in:
Sunil Mohan Adapa 2015-11-26 11:06:44 +05:30
parent 921f7c8767
commit 0220cff57c
2 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
plinth/modules/upgrades/templates/upgrades.html
View File

@ -35,35 +35,30 @@
{% if result %} {% if result %}
{% if result.error %} {% if result.return_code %}
<div class="alert alert-danger" role="alert"> <p>
{% trans "There was an error while upgrading." %} {% trans "There was an error while upgrading." %}
</div> </p>
<h5>{% trans "Output from unattended-upgrades:" %}</h5> <h5>{% trans "Output from unattended-upgrades:" %}</h5>
<pre>{{ result.error }}</pre> <pre>{{ result.error }}</pre>
{% endif %} {% if result.output %}
<pre>{{ result.output }}</pre>
{% if result.output %} {% endif %}
<div class="row"> {% else %}
<div class="col-lg-6"> <p>
<div class="alert alert-success" role="alert"> {% trans "The operating system is up to date now. &nbsp;" %}
{% trans "The operating system is up to date now. &nbsp;" %} <button type="button" class="btn btn-default show-details"
<button type="button" class="btn btn-default show-details" style='display: none;'>
style='display:none'> {% trans "Show Details" %}
{% trans "Show Details" %} <div class="caret"></div>
<div class="caret"></div> </button>
</button> </p>
</div>
</div>
</div>
<div class="details"> <div class="details">
<h5>{% trans "Output from unattended-upgrades:" %}</h5> <h5>{% trans "Output from unattended-upgrades:" %}</h5>
<pre>{{ result.output }}</pre> <pre>{{ result.output }}</pre>
</div> </div>
{% endif %} {% endif %}
{% endif %} {% endif %}
@ -89,7 +84,7 @@
{% if running %} {% if running %}
<p class="running-status-parent"> <p class="running-status-parent">
<span class="running-status active"></span> <span class="running-status active"></span>
{% trans "Upgrade is running" %} {% trans "System is being upgraded." %}
</p> </p>
{% endif %} {% endif %}

9
plinth/modules/upgrades/views.py
View File

@ -69,10 +69,7 @@ def index(request):
@package.required(['unattended-upgrades'], on_install=on_install) @package.required(['unattended-upgrades'], on_install=on_install)
def upgrade(request): def upgrade(request):
"""Serve the upgrade page.""" """Serve the upgrade page."""
if upgrade_process: result = _collect_upgrade_result(request)
result = _collect_upgrade_result(request)
else:
result = None
return TemplateResponse(request, 'upgrades.html', return TemplateResponse(request, 'upgrades.html',
{'title': _('Package Upgrades'), {'title': _('Package Upgrades'),
@ -135,7 +132,7 @@ def _collect_upgrade_result(request):
return_code = upgrade_process.poll() return_code = upgrade_process.poll()
# Upgrade process is not complete yet # Upgrade process is not complete yet
if return_code == None: if return_code is None:
return return
output, error = upgrade_process.communicate() output, error = upgrade_process.communicate()
@ -144,7 +141,7 @@ def _collect_upgrade_result(request):
if not return_code: if not return_code:
messages.success(request, _('Upgrade completed.')) messages.success(request, _('Upgrade completed.'))
else: else:
messages.info(request, _('Upgrade failed.')) messages.error(request, _('Upgrade failed.'))
upgrade_process = None upgrade_process = None