Proxmox/pve-manager
5
0
Fork 0
Code Pull Requests Releases Activity

improve changelog viewer

Browse Source
This commit is contained in:
Dietmar Maurer 2013-06-18 11:46:32 +02:00
parent 59c8caa91a
commit d3ce353536
2 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PVE/API2/APT.pm
View File

@ -10,7 +10,7 @@ use PVE::Tools qw(extract_param);
use PVE::Cluster;
use PVE::SafeSyslog;
use PVE::INotify;
use PVE::Exception qw(raise_param_exc);
use PVE::Exception;
use PVE::RESTHandler;
use PVE::RPCEnvironment;
@ -136,7 +136,7 @@ my $update_pve_pkgstatus = sub {
my $current_ver = $p->{CurrentVer};
my $candidate_ver = $policy->candidate($p);
if ($pkgname eq 'apt' || $current_ver->{VerStr} ne $candidate_ver->{VerStr}) {
if ($current_ver->{VerStr} ne $candidate_ver->{VerStr}) {
my $info = $pkgrecords->lookup($pkgname);
my $res = &$assemble_pkginfo($pkgname, $info, $current_ver, $candidate_ver);
push @$pkglist, $res;
@ -365,7 +365,7 @@ __PACKAGE__->register_method({
if ($response->is_success) {
$data = $response->decoded_content;
} else {
die $response->status_line;
PVE::Exception::raise($response->message, code => $response->code);
}
return $data;

55
www/manager/node/APT.js
View File

@ -93,40 +93,43 @@ Ext.define('PVE.node.APT', {
return;
}
var view = Ext.createWidget('component', {
autoScroll: true,
style: {
'background-color': 'white',
'white-space': 'pre',
'font-family': 'monospace',
padding: '5px'
}
});
var win = Ext.create('Ext.window.Window', {
title: gettext('Changelog') + ": " + rec.data.Package,
width: 800,
height: 400,
layout: 'fit',
modal: true,
items: {
xtype: 'component',
autoScroll: true,
style: {
'background-color': 'white',
'white-space': 'pre',
padding: '10px'
},
loader: {
url: "/api2/json/nodes/" + nodename + "/apt/changelog",
params: {
name: rec.data.Package,
version: rec.data.Version
},
ajaxOptions: { method: 'GET' },
renderer: function(loader, response, active) {
var result = Ext.decode(response.responseText);
if (result && result.data) {
loader.getTarget().update(Ext.htmlEncode(result.data));
} else {
console.dir(response);
}
},
autoLoad: true
}
items: [ view ]
});
PVE.Utils.API2Request({
waitMsgTarget: me,
url: "/nodes/" + nodename + "/apt/changelog",
params: {
name: rec.data.Package,
version: rec.data.Version
},
method: 'GET',
failure: function(response, opts) {
win.close();
Ext.Msg.alert('Error', response.htmlStatus);
},
success: function(response, opts) {
win.show();
view.update(Ext.htmlEncode(response.result.data));
}
});
win.show();
};
var changelog_btn = new PVE.button.Button({