Commit 4c68e8c2 authored by Franco Fichtner's avatar Franco Fichtner

firmware: two problems

o Licenses are only readable from installed files, back out of plugins
o Audit did overwrite the "done" message for plugin ops et al
parent 85e4bef0
...@@ -192,6 +192,7 @@ POSSIBILITY OF SUCH DAMAGE. ...@@ -192,6 +192,7 @@ POSSIBILITY OF SUCH DAMAGE.
$('#update_status').show(); $('#update_status').show();
$('#updatetab > a').tab('show'); $('#updatetab > a').tab('show');
$('#updatestatus').html("{{ lang._('Executing...') }}"); $('#updatestatus').html("{{ lang._('Executing...') }}");
$.upgrade_action = 'action';
ajaxCall('/api/core/firmware/'+pkg_act+'/'+pkg_name,{},function() { ajaxCall('/api/core/firmware/'+pkg_act+'/'+pkg_name,{},function() {
$('#updatelist').empty(); $('#updatelist').empty();
...@@ -254,6 +255,8 @@ POSSIBILITY OF SUCH DAMAGE. ...@@ -254,6 +255,8 @@ POSSIBILITY OF SUCH DAMAGE.
$('#updatestatus').html("{{ lang._('Package manager update done. Please check for more updates.') }}"); $('#updatestatus').html("{{ lang._('Package manager update done. Please check for more updates.') }}");
} else if ($.upgrade_action == 'audit') { } else if ($.upgrade_action == 'audit') {
$('#updatestatus').html("{{ lang._('Audit done.') }}"); $('#updatestatus').html("{{ lang._('Audit done.') }}");
} else if ($.upgrade_action == 'action') {
$('#updatestatus').html("{{ lang._('Done.') }}");
} else { } else {
$('#updatestatus').html("{{ lang._('Upgrade done.') }}"); $('#updatestatus').html("{{ lang._('Upgrade done.') }}");
} }
...@@ -298,7 +301,7 @@ POSSIBILITY OF SUCH DAMAGE. ...@@ -298,7 +301,7 @@ POSSIBILITY OF SUCH DAMAGE.
"<th>{{ lang._('License') }}</th><th>{{ lang._('Comment') }}</th><th></th></tr>"); "<th>{{ lang._('License') }}</th><th>{{ lang._('Comment') }}</th><th></th></tr>");
$("#pluginlist").html("<tr><th>{{ lang._('Name') }}</th>" + $("#pluginlist").html("<tr><th>{{ lang._('Name') }}</th>" +
"<th>{{ lang._('Version') }}</th><th>{{ lang._('Size') }}</th>" + "<th>{{ lang._('Version') }}</th><th>{{ lang._('Size') }}</th>" +
"<th>{{ lang._('License') }}</th><th>{{ lang._('Comment') }}</th><th></th></tr>"); "<th>{{ lang._('Comment') }}</th><th></th></tr>");
var local_count = 0; var local_count = 0;
var remote_count = 0; var remote_count = 0;
...@@ -352,12 +355,8 @@ POSSIBILITY OF SUCH DAMAGE. ...@@ -352,12 +355,8 @@ POSSIBILITY OF SUCH DAMAGE.
'<tr>' + '<td>' + row['name'] + orphaned_text + '</td>' + '<tr>' + '<td>' + row['name'] + orphaned_text + '</td>' +
'<td>' + row['version'] + '</td>' + '<td>' + row['version'] + '</td>' +
'<td>' + row['flatsize'] + '</td>' + '<td>' + row['flatsize'] + '</td>' +
'<td>' + row['license'] + '</td>' +
'<td>' + row['comment'] + '</td>' + '<td>' + row['comment'] + '</td>' +
'<td><button class="btn btn-default btn-xs act_license" data-package="' + row['name'] + '" ' + '<td>' + (row['installed'] == "1" ?
' data-toggle="tooltip" title="View ' + row['name'] + ' license">' +
'<span class="fa fa-balance-scale"></span></button> ' +
(row['installed'] == "1" ?
'<button class="btn btn-default btn-xs act_remove" data-package="' + row['name'] + '" '+ '<button class="btn btn-default btn-xs act_remove" data-package="' + row['name'] + '" '+
' data-toggle="tooltip" title="Remove ' + row['name'] + '">' + ' data-toggle="tooltip" title="Remove ' + row['name'] + '">' +
'<span class="fa fa-trash">' + '<span class="fa fa-trash">' +
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment