PV's patch to make the webapp recursive delete checkboxes behave as expected

4 files changed, 18 insertions, 17 deletions

diff --git a/cobbler/webui/CobblerWeb.py b/cobbler/webui/CobblerWeb.py
index c5115c19..9adc7b25 100644
--- a/cobbler/webui/CobblerWeb.py
+++ b/cobbler/webui/CobblerWeb.py
@@ -197,7 +197,7 @@ class CobblerWeb(object):
 
     def distro_save(self,name=None,comment=None,oldname=None,new_or_edit=None,editmode='edit',kernel=None,
                     initrd=None,kopts=None,koptspost=None,ksmeta=None,owners=None,arch=None,breed=None,
-                    osversion=None,delete1=None,delete2=None,recursive=False,**args):
+                    osversion=None,delete1=False,delete2=False,recursive=False,**args):
 
         if not self.__xmlrpc_setup():
             return self.xmlrpc_auth_failure()
@@ -210,10 +210,10 @@ class CobblerWeb(object):
         # handle deletes as a special case
         if new_or_edit == 'edit' and delete1 and delete2:
             try:    
-                if recursive is None: 
-                    self.remote.remove_distro(name,self.token,False)
-                else:
+                if recursive: 
                     self.remote.remove_distro(name,self.token,True)
+                else:
+                    self.remote.remove_distro(name,self.token,False)
                        
             except Exception, e:
                 return self.error_page("could not delete %s, %s" % (name,str(e)))
@@ -533,7 +533,7 @@ class CobblerWeb(object):
     def profile_save(self,new_or_edit=None,editmode='edit',name=None,comment=None,oldname=None,
                      distro=None,kickstart=None,kopts=None,koptspost=None,
                      ksmeta=None,owners=None,enablemenu=None,virtfilesize=None,virtram=None,virttype=None,
-                     virtpath=None,repos=None,dhcptag=None,delete1=None,delete2=None,
+                     virtpath=None,repos=None,dhcptag=None,delete1=False,delete2=False,
                      parent=None,virtcpus=None,virtbridge=None,subprofile=None,server_override=None,
                      name_servers=None,recursive=False,**args):
 
@@ -792,7 +792,7 @@ class CobblerWeb(object):
     def image_save(self,name=None,comment=None,oldname=None,new_or_edit=None,editmode='edit',field1=None,
                    file=None,arch=None,breed=None,virtram=None,virtfilesize=None,virtpath=None,
                    virttype=None,virtcpus=None,virtbridge=None,imagetype=None,owners=None,
-                   osversion=None,delete1=None,delete2=None,recursive=False,networkcount=None,**args):
+                   osversion=None,delete1=False,delete2=False,recursive=False,networkcount=None,**args):
 
         if not self.__xmlrpc_setup():
             return self.xmlrpc_auth_failure()
@@ -805,10 +805,10 @@ class CobblerWeb(object):
         # handle deletes as a special case
         if new_or_edit == 'edit' and delete1 and delete2:
             try:    
-                if recursive is None: 
-                    self.remote.remove_image(name,self.token,False)
-                else:
+                if recursive: 
                     self.remote.remove_image(name,self.token,True)
+                else:
+                    self.remote.remove_image(name,self.token,False)
                        
             except Exception, e:
                 return self.error_page("could not delete %s, %s" % (name,str(e)))
diff --git a/webui_templates/distro_edit.tmpl b/webui_templates/distro_edit.tmpl
index 2e772b4b..c46d5a44 100644
--- a/webui_templates/distro_edit.tmpl
+++ b/webui_templates/distro_edit.tmpl
@@ -288,9 +288,9 @@ function disablename(value)
     <label for="delete">Delete</label>
     </td>
     <td>
-       <input type="checkbox" name="delete1" value="delete1">Yes
-       <input type="checkbox" name="delete2" value="delete2">Really
-       <input type="checkbox" name="recursive" value="recursive">Delete child objects?
+       <input type="checkbox" name="delete1" value="True">Yes
+       <input type="checkbox" name="delete2" value="True">Really
+       <input type="checkbox" name="recursive" value="True">Delete child objects?
        <p class="context-tip">Check both buttons and click save to delete this object</p>
     </td>
     </tr>
diff --git a/webui_templates/image_edit.tmpl b/webui_templates/image_edit.tmpl
index 50f03427..f4e95884 100644
--- a/webui_templates/image_edit.tmpl
+++ b/webui_templates/image_edit.tmpl
@@ -375,8 +375,9 @@ function disablename(value)
     <label for="delete">Delete</label>
     </td>
     <td>
-       <input type="checkbox" name="delete1" value="delete1">Yes
-       <input type="checkbox" name="delete2" value="delete2">Really
+       <input type="checkbox" name="delete1" value="True">Yes
+       <input type="checkbox" name="delete2" value="True">Really
+       <input type="checkbox" name="recursive" value="True">Delete child objects?
        <p class="context-tip">Check both buttons and click save to delete this object</p>
     </td>
     </tr>
diff --git a/webui_templates/profile_edit.tmpl b/webui_templates/profile_edit.tmpl
index 86194c8f..b0f047fb 100644
--- a/webui_templates/profile_edit.tmpl
+++ b/webui_templates/profile_edit.tmpl
@@ -442,9 +442,9 @@ function disablename(value)
     <label for="delete">Delete</label>
     </td>
     <td>
-       <input type="checkbox" name="delete1" value="delete1">Yes
-       <input type="checkbox" name="delete2" value="delete2">Really
-       <input type="checkbox" name="recursive" value="recursive">Delete child objects?
+       <input type="checkbox" name="delete1" value="True">Yes
+       <input type="checkbox" name="delete2" value="True">Really
+       <input type="checkbox" name="recursive" value="True">Delete child objects?
     <p class="context-tip">Check both buttons and click save to delete this object</p>
     </td>
     </tr>