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

#814 when deleting device, avoid deleting jobs running on the device

Browse Source
This commit is contained in:
Oliver Gorwits
2021-10-04 19:35:42 +01:00
parent fd6a7ea5fb
commit a040e8ae38
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/App/Netdisco/DB/ResultSet/Device.pm
View File

@@ -716,14 +716,14 @@ sub delete {
$ip, $gone, _plural($gone), $set ) ) if defined Dancer::Logger::logger(); $ip, $gone, _plural($gone), $set ) ) if defined Dancer::Logger::logger();
} }
foreach my $set (qw/ $schema->resultset('Admin')->search({
Admin device => { '-in' => $devices->as_query },
DeviceSkip status => { '-not_like' => 'queued-%' },
/) { })->delete;
$schema->resultset($set)->search(
{ device => { '-in' => $devices->as_query } }, $schema->resultset('DeviceSkip')->search(
)->delete; { device => { '-in' => $devices->as_query } },
} )->delete;
my $gone = $schema->resultset('Topology')->search({ my $gone = $schema->resultset('Topology')->search({
-or => [ -or => [