135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

show log message in toastr

Browse Source
This commit is contained in:
Oliver Gorwits
2012-12-03 22:38:22 +00:00
parent 4c69724738
commit 3e3ceb59af
2 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Netdisco/lib/Netdisco/Web/PortControl.pm
View File

@@ -54,8 +54,14 @@ ajax '/ajax/userlog' => sub {
}); });
my %status = ( my %status = (
'done' => $rs->search({status => 'done'})->count(), 'done' => [
'error' => $rs->search({status => 'error'})->count(), map {s/\[\]/<empty>/; $_}
$rs->search({status => 'done'})->get_column('log')->all
],
'error' => [
map {s/\[\]/<empty>/; $_}
$rs->search({status => 'error'})->get_column('log')->all
],
); );
content_type('application/json'); content_type('application/json');

14
Netdisco/public/javascripts/netdisco_portcontrol.js
View File

@@ -30,18 +30,12 @@ function port_control (e) {
,success: function(data) { ,success: function(data) {
// console.log(data); // console.log(data);
if (data['error'] == 1 ) { for (var i = 0; i < data['error'].length; i++) {
toastr.error('1 recent failed change request'); toastr.error(data['error'][i], 'Failed Change Request');
}
else if (data['error'] > 1) {
toastr.error(data['error'] + ' recent failed change requests');
} }
if (data['done'] == 1 ) { for (var i = 0; i < data['done'].length; i++) {
toastr.success('1 recent successful change request'); toastr.success(data['done'][i], 'Successful Change Request');
}
else if (data['done'] > 1) {
toastr.success(data['done'] + ' recent successful change requests');
} }
// Schedule next request when the current one's complete // Schedule next request when the current one's complete