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

fix crazy races with javasacript by using global delegations

Browse Source
This commit is contained in:
Oliver Gorwits
2013-05-09 21:05:42 +01:00
parent e94e3cef3b
commit 6a17fe5d6c
3 changed files with 27 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,8 +29,7 @@ sub _sanity_ok {
}
ajax '/ajax/content/admin/pseudodevice/add' => sub {
forward '/ajax/content/admin/pseudodevice'
unless _sanity_ok();
return unless _sanity_ok();
schema('netdisco')->txn_do(sub {
my $device = schema('netdisco')->resultset('Device')
@@ -47,13 +46,10 @@ ajax '/ajax/content/admin/pseudodevice/add' => sub {
map {["Port$_"]} @{[1 .. param('ports')]},
]);
});
forward '/ajax/content/admin/pseudodevice';
};
ajax '/ajax/content/admin/pseudodevice/del' => sub {
forward '/ajax/content/admin/pseudodevice'
unless _sanity_ok();
return unless _sanity_ok();
schema('netdisco')->txn_do(sub {
my $device = schema('netdisco')->resultset('Device')
@@ -62,13 +58,10 @@ ajax '/ajax/content/admin/pseudodevice/del' => sub {
$device->ports->delete;
$device->delete;
});
forward '/ajax/content/admin/pseudodevice';
};
ajax '/ajax/content/admin/pseudodevice/update' => sub {
forward '/ajax/content/admin/pseudodevice'
unless _sanity_ok();
return unless _sanity_ok();
schema('netdisco')->txn_do(sub {
my $device = schema('netdisco')->resultset('Device')
@@ -90,8 +83,6 @@ ajax '/ajax/content/admin/pseudodevice/update' => sub {
for ($start .. $count);
}
});
forward '/ajax/content/admin/pseudodevice';
};
ajax '/ajax/content/admin/pseudodevice' => sub {

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

@@ -28,8 +28,7 @@ sub _sanity_ok {
}
ajax '/ajax/content/admin/topology/add' => sub {
forward '/ajax/content/admin/topology'
unless _sanity_ok();
return unless _sanity_ok();
my $device = schema('netdisco')->resultset('Topology')
->create({
@@ -38,13 +37,10 @@ ajax '/ajax/content/admin/topology/add' => sub {
dev2 => param('dev2'),
port2 => param('port2'),
});
forward '/ajax/content/admin/topology';
};
ajax '/ajax/content/admin/topology/del' => sub {
forward '/ajax/content/admin/topology'
unless _sanity_ok();
return unless _sanity_ok();
schema('netdisco')->txn_do(sub {
my $device = schema('netdisco')->resultset('Topology')
@@ -55,8 +51,6 @@ ajax '/ajax/content/admin/topology/del' => sub {
port2 => param('port2'),
})->delete;
});
forward '/ajax/content/admin/topology';
};
ajax '/ajax/content/admin/topology' => sub {