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

complete job queue delete and kill running timers properly when reloading page

Browse Source
This commit is contained in:
Oliver Gorwits
2013-05-11 18:25:04 +01:00
parent dd6947f38d
commit 74bc0023df
7 changed files with 47 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Netdisco/lib/App/Netdisco/Web/Plugin/AdminTask/JobQueue.pm
View File

@@ -11,6 +11,16 @@ register_admin_task({
label => 'Job Queue',
});
ajax '/ajax/control/admin/jobqueue/del' => sub {
return unless var('user') and var('user')->admin;
return unless length param('job');
schema('netdisco')->txn_do(sub {
my $device = schema('netdisco')->resultset('Admin')
->search({job => param('job')})->delete;
});
};
ajax '/ajax/content/admin/jobqueue' => sub {
return unless var('user') and var('user')->admin;

6
Netdisco/lib/App/Netdisco/Web/Plugin/AdminTask/PseudoDevice.pm
View File

@@ -28,7 +28,7 @@ sub _sanity_ok {
return 1;
}
ajax '/ajax/content/admin/pseudodevice/add' => sub {
ajax '/ajax/control/admin/pseudodevice/add' => sub {
return unless _sanity_ok();
schema('netdisco')->txn_do(sub {
@@ -48,7 +48,7 @@ ajax '/ajax/content/admin/pseudodevice/add' => sub {
});
};
ajax '/ajax/content/admin/pseudodevice/del' => sub {
ajax '/ajax/control/admin/pseudodevice/del' => sub {
return unless _sanity_ok();
schema('netdisco')->txn_do(sub {
@@ -60,7 +60,7 @@ ajax '/ajax/content/admin/pseudodevice/del' => sub {
});
};
ajax '/ajax/content/admin/pseudodevice/update' => sub {
ajax '/ajax/control/admin/pseudodevice/update' => sub {
return unless _sanity_ok();
schema('netdisco')->txn_do(sub {

4
Netdisco/lib/App/Netdisco/Web/Plugin/AdminTask/Topology.pm
View File

@@ -27,7 +27,7 @@ sub _sanity_ok {
return 1;
}
ajax '/ajax/content/admin/topology/add' => sub {
ajax '/ajax/control/admin/topology/add' => sub {
return unless _sanity_ok();
my $device = schema('netdisco')->resultset('Topology')
@@ -39,7 +39,7 @@ ajax '/ajax/content/admin/topology/add' => sub {
});
};
ajax '/ajax/content/admin/topology/del' => sub {
ajax '/ajax/control/admin/topology/del' => sub {
return unless _sanity_ok();
schema('netdisco')->txn_do(sub {