mirror of
https://github.com/webmin/webmin.git
synced 2025-07-25 15:09:18 +00:00
Fixed fileset deletion dependency bug.
This commit is contained in:
@ -15,7 +15,7 @@ $parent = &get_director_config_parent();
|
|||||||
foreach $d (@d) {
|
foreach $d (@d) {
|
||||||
$fileset = &find_by("Name", $d, \@filesets);
|
$fileset = &find_by("Name", $d, \@filesets);
|
||||||
if ($fileset) {
|
if ($fileset) {
|
||||||
$child = &find_dependency("Client", $d, [ "Job", "JobDefs" ], $conf);
|
$child = &find_dependency("FileSet", $d, [ "Job", "JobDefs" ], $conf);
|
||||||
$child && &error(&text('fileset_echild', $child));
|
$child && &error(&text('fileset_echild', $child));
|
||||||
&save_directive($conf, $parent, $fileset, undef, 0);
|
&save_directive($conf, $parent, $fileset, undef, 0);
|
||||||
}
|
}
|
||||||
|
@ -20,8 +20,8 @@ else {
|
|||||||
&lock_file($parent->{'file'});
|
&lock_file($parent->{'file'});
|
||||||
if ($in{'delete'}) {
|
if ($in{'delete'}) {
|
||||||
# Just delete this one
|
# Just delete this one
|
||||||
$name = &find_value("Name", $client->{'members'});
|
$name = &find_value("Name", $fileset->{'members'});
|
||||||
$child = &find_dependency("Client", $name, [ "Job", "JobDefs" ], $conf);
|
$child = &find_dependency("FileSet", $name, [ "Job", "JobDefs" ], $conf);
|
||||||
$child && &error(&text('fileset_echild', $child));
|
$child && &error(&text('fileset_echild', $child));
|
||||||
&save_directive($conf, $parent, $fileset, undef, 0);
|
&save_directive($conf, $parent, $fileset, undef, 0);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user