Apply Peter Vreman's patch to add a lot of very cool batch editing features -- changing profiles, power cycling, netboot status, etc -- all for system objects.

3 files changed, 104 insertions, 46 deletions

diff --git a/webui_templates/master.tmpl b/webui_templates/master.tmpl
index 2ef2d2a6..6080b819 100644
--- a/webui_templates/master.tmpl
+++ b/webui_templates/master.tmpl
@@ -45,7 +45,7 @@
         <li><a href="$base_url?mode=system_list" class="menu">Systems</a></li>
 	    #if $mode == "system_list"       
     	    <ul id="navaction">
-    		<li><a href="$base_url?mode=system_edit" class="menu">Add</a></li>
+    		<li><a href="$base_url?mode=system_edit_new" class="menu">Add</a></li>
 	    </ul>
 	    #end if	    
         <li><a href="$base_url?mode=ksfile_list" class="menu">Kickstarts</a></li>
diff --git a/webui_templates/system_edit.tmpl b/webui_templates/system_edit.tmpl
index fd471c64..3b606b56 100644
--- a/webui_templates/system_edit.tmpl
+++ b/webui_templates/system_edit.tmpl
@@ -343,16 +343,14 @@ function page_onload() {
 <fieldset id="cform">
 
     <input name="interface_list" type="hidden" value="" id="interface_list"/>
-   
-    #if $system
-        <input type="hidden" name="new_or_edit" value="edit"/>
-        <input type="hidden" name="oldname" value="$system.name"/>
+    <input type="hidden" name="editmode" value="$editmode"/>
+    
+    #if $editmode == "new"   
+        <legend>Add a System</legend>
     #else
-        <input type="hidden" name="new_or_edit" value="new"/>
+        <legend>Edit a System</legend>
     #end if
-
-    <legend>Edit a System</legend>
-
+    
     <table border=0>
 
     <tr>
@@ -360,14 +358,10 @@ function page_onload() {
     <label for="name">System Name</label>
     </td>
     <td>
-    #if $system
-    <input type="text" size="128" style="width: 150px;" name="name" id="name" disabled="true"
-    #else
     <input type="text" size="128" style="width: 150px;" name="name" id="name"
+    #if $editmode == "edit"
+        value="$system.name" disabled="true"
     #end if
-        #if $system
-            value="$system.name"
-        #end if
     />
     <p class="context-tip">Example: vanhalen</p>
     </td>
@@ -376,22 +370,6 @@ function page_onload() {
     #if $system
     <tr>
     <td>
-    <label for="mode">Edit Mode</label>
-    </td>
-    <td>
-    <input type="radio" name="editmode" value="edit" checked onclick="javascript:disablename(true)">Edit
-    <input type="radio" name="editmode" value="rename" onclick="javascript:disablename(false)">Rename + Edit
-    <input type="radio" name="editmode" value="copy" onclick="javascript:disablename(false)">Copy + Edit
-    <p class="context-tip">How do you want to modify this object?</p>
-    </td>
-    </tr>
-    #else
-    <input type="hidden" name="editmode" value="new"/>
-    #end if
-
-    #if $system
-    <tr>
-    <td>
     <label>Created</label>
     </td>
     <td>
@@ -969,19 +947,6 @@ redhatmanagementkey"
     </td>
     </tr>
 
-    #if $system and $editable == True
-    <tr>
-    <td>
-    <label for="delete">Delete</label>
-    </td>
-    <td>
-       <input type="checkbox" name="delete1" value="delete1">Yes
-       <input type="checkbox" name="delete2" value="delete2">Really
-    <p class="context-tip">Check both buttons and click save to delete this object</p>
-    </td>
-    </tr>
-    #end if
-
     #if $editable == True
     <tr>
     <td>
diff --git a/webui_templates/system_list.tmpl b/webui_templates/system_list.tmpl
index 6ab5face..9899ca51 100644
--- a/webui_templates/system_list.tmpl
+++ b/webui_templates/system_list.tmpl
@@ -7,14 +7,71 @@
     #include "/usr/share/cobbler/webui_templates/paginate.tmpl"
     ## ==== END PAGE NAVIGATION ====
 
-<table class="sortable">
 
+    ## ==== BEGIN CHECKBOX SUPPORT  ====
+    #include "/usr/share/cobbler/webui_templates/checkboxes.tmpl"
+    ## ==== END CHECKBOX SUPPORT ====
+
+<script language="Javascript">
+function action_selected(actionname)
+{
+    var itemcount=items_checked_count();
+    if (
+        (itemcount == 0) &&
+        (
+         (actionname == "delete") ||
+         (actionname == "netboot") ||
+         (actionname == "profile") ||
+         (actionname == "power")
+        )
+       )
+    {
+	alert("Select the systems to " + actionname+" first");
+	return;
+    }
+    else if (
+             (itemcount != 1) &&
+             (
+              (actionname == "copy") ||
+              (actionname == "rename")
+             )
+            )
+    {
+	alert("Select only one system to " + actionname);
+	return;
+    }
+
+    document.getElementById("targetlist").value=items_checked_values();
+    document.getElementById("actionname").value=actionname;
+
+    document.myform.submit();
+}
+
+function action_single(actionname,target)
+{
+    document.getElementById("targetlist").value=target;
+    document.getElementById("actionname").value=actionname;
+
+    document.myform.submit();
+}
+</script>
+
+<form name="myform" method="post" action="$base_url?mode=system_list_action">
+    <input type="hidden" name="actionname" id="actionname" value=""/>
+    <input type="hidden" name="targetlist" id="targetlist" value=""/>
+
+    <table class="sortable">
     <thead>
         <caption>Cobbler Systems</caption>
         <tr>
+	    <th class="text"><input type="checkbox" id="itemsall" onclick="javascript:items_check_all();"></th>
             <th class="text">Name</th>
+            <th class="text">Netboot</th>
             <th class="text">Profile</th>
             <th class="text">Kickstart</th>
+            <th class="text"></th>
+            <th class="text"></th>
+            <th class="text"></th>
         </tr>
     </thead>
     <tbody>
@@ -29,8 +86,21 @@
 
         <tr class="$tr_class">
             <td>
+		<input type="checkbox" name="items" value="${system.name}">
+            </td>
+
+            <td>
                 <a href="$base_url?mode=system_edit&name=${system.name}">${system.name}</a>
             </td>
+
+            <td>
+            #if str($system.netboot_enabled) != "False"
+                Yes
+            #else
+                No
+            #end if
+            </td>
+
             <td>
                 <a href="$base_url?mode=profile_edit&name=${system.profile}">${system.profile}</a>
             </td>
@@ -55,10 +125,33 @@
                    #end if 
                 #end if
             </td>
+
+            <td>
+                <input type="button" name="edit" onClick="javascript:action_single('edit','${system.name}')" value="Edit"/>
+            </td>
+
+            <td>
+                <input type="button" name="rename" onClick="javascript:action_single('rename','${system.name}')" value="Rename"/>
+            </td>
+
+            <td>
+                <input type="button" name="copy" onClick="javascript:action_single('copy','${system.name}')" value="Copy"/>
+            </td>
+
         </tr>
 
 
         #end for
     </tbody>
-</table>
+    </table>
+</form>
+
+    <br/>
+    Operations on selected systems:
+    <br/>
+    <input type="button" name="delete" onClick="javascript:action_selected('delete')" value="Delete"/>
+    <input type="button" name="netboot" onClick="javascript:action_selected('netboot')" value="Change Netboot"/>
+    <input type="button" name="profile" onClick="javascript:action_selected('profile')" value="Change Profile"/>
+    <input type="button" name="power" onClick="javascript:action_selected('power')" value="Power control"/>
+
 #end block body