diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-01-31 15:22:57 -0500 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-01-31 15:22:57 -0500 |
| commit | 10d7d85c1faf6bf46824060de04b02fd68b66ce8 (patch) | |
| tree | fe89b0b24ec212f15e812c2c953de03095984f91 /cobbler | |
| parent | 424f947cf7622dd8aa987917f83170dc5bfbcd9f (diff) | |
| download | third_party-cobbler-10d7d85c1faf6bf46824060de04b02fd68b66ce8.tar.gz third_party-cobbler-10d7d85c1faf6bf46824060de04b02fd68b66ce8.tar.xz third_party-cobbler-10d7d85c1faf6bf46824060de04b02fd68b66ce8.zip | |
Make WebUI do recursive deletes for distros/profiles.
Diffstat (limited to 'cobbler')
| -rw-r--r-- | cobbler/remote.py | 4 | ||||
| -rw-r--r-- | cobbler/webui/CobblerWeb.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cobbler/remote.py b/cobbler/remote.py index 221cf0c..57570aa 100644 --- a/cobbler/remote.py +++ b/cobbler/remote.py @@ -870,7 +870,7 @@ class CobblerReadWriteXMLRPCInterface(CobblerXMLRPCInterface): """ self.log("remove_distro",name=name,token=token) self.check_access(token, "remove_distro", name) - rc = self.api._config.distros().remove(name,recursive) + rc = self.api._config.distros().remove(name,recursive=True) return rc def remove_profile(self,name,token,recursive=1): @@ -880,7 +880,7 @@ class CobblerReadWriteXMLRPCInterface(CobblerXMLRPCInterface): """ self.log("remove_profile",name=name,token=token) self.check_access(token, "remove_profile", name) - rc = self.api._config.profiles().remove(name,recursive) + rc = self.api._config.profiles().remove(name,recursive=True) return rc def remove_system(self,name,token): diff --git a/cobbler/webui/CobblerWeb.py b/cobbler/webui/CobblerWeb.py index 4230546..9a0cf90 100644 --- a/cobbler/webui/CobblerWeb.py +++ b/cobbler/webui/CobblerWeb.py @@ -183,7 +183,7 @@ class CobblerWeb(object): # handle deletes as a special case if new_or_edit == 'edit' and delete1 and delete2: try: - self.remote.remove_distro(name,self.token) + self.remote.remove_distro(name,self.token,1) # recursive except Exception, e: return self.error_page("could not delete %s, %s" % (name,str(e))) return self.distro_list() @@ -463,7 +463,7 @@ class CobblerWeb(object): # handle deletes as a special case if new_or_edit == 'edit' and delete1 and delete2: try: - self.remote.remove_profile(name,self.token) + self.remote.remove_profile(name,self.token,1) except Exception, e: return self.error_page("could not delete %s, %s" % (name,str(e))) return self.profile_list() |