lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-16 01:24:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

firmware: small design improvement and release type shift warning #4500

Browse Source
This commit is contained in:
Franco Fichtner 2021-02-14 14:31:22 +01:00
parent 694333657a
commit fd2bc705ac
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php
View File

@ -233,6 +233,8 @@ class FirmwareController extends ApiControllerBase
} elseif (array_key_exists('updates', $response) && $response['updates'] != 0) {
if (!empty($target)) {
$response['status_msg'] = gettext('The release type requires an update.');
$response['status_msg'] .= ' '; /* XXX eventually we should return all updates AND release type change to make this look normal */
$response['status_msg'] .= gettext('All available updates must be installed in the background as well and this may include a reboot.');
$response['status_upgrade_action'] = 'rel';
$response['status'] = 'ok';
} else {

17
src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt
View File

@ -80,9 +80,6 @@
// show upgrade list
$('#updatelist > tbody').empty();
$('#updatetab > a').tab('show');
$("#updatelist > thead").html("<tr><th>{{ lang._('Package Name') }}</th>" +
"<th>{{ lang._('Repository') }}</th><th>{{ lang._('Current Version') }}</th>" +
"<th>{{ lang._('New Version') }}</th><th>{{ lang._('Required Action') }}</th></tr>");
$.each(data['all_packages'], function (index, row) {
$('#updatelist > tbody').append('<tr><td>'+row['name']+'</td>' +
'<td>'+row['repository']+'</td><td>'+row['old']+'</td><td>' +
@ -139,7 +136,7 @@
$('#updatetab_progress').addClass("fa fa-spinner fa-pulse");
ajaxCall('/api/core/firmware/' + type, post, function () {
$('#updatelist > tbody, #updatelist > thead').empty();
$('#updatelist > tbody').empty();
setTimeout(trackStatus, 500);
});
}
@ -811,12 +808,20 @@
<div class="tab-content content-box">
<div id="updates" class="tab-pane">
<table class="table table-striped table-condensed table-responsive" id="updatelist" style="display: none;">
<thead></thead>
<thead>
<tr>
<th style="width:20%">{{ lang._('Package name') }}</th>
<th style="width:20%">{{ lang._('Repository') }}</th>
<th style="width:20%">{{ lang._('Current version') }}</th>
<th style="width:20%">{{ lang._('New version') }}</th>
<th style="width:20%">{{ lang._('Required action') }}</th>
</tr>
</thead>
<tbody></tbody>
<tfoot>
<tr>
<td></td>
<td style="vertical-align:middle">
<td style="white-space:nowrap;vertical-align:middle;">
<button class="btn btn-primary" id="upgrade"><i class="fa fa-check"></i> {{ lang._('Update') }}</button>
<button class="btn btn-default" id="upgrade_dismiss"><i class="fa fa-times"></i> {{ lang._('Dismiss') }}</button>
</td>