MP: fixed search results form so it actually clears the forms now and…

… so that it will remember the last search that was done. Also prep new sql upgrade file
Gankarloo · May 21, 2009 · 2d6c417 · 2d6c417
1 parent a0076ab
commit 2d6c417
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 13 deletions.
diff --git a/install/6-to-7.sql b/install/6-to-7.sql
@@ -0,0 +1,10 @@
+-- Create the block table if it is not there.. fixes bug in v09.05.02
+CREATE TABLE IF NOT EXISTS `blocks` (
+  `id` int(10) unsigned NOT NULL,
+  `ip_addr_start` int(10) unsigned NOT NULL,
+  `ip_addr_end` int(10) unsigned NOT NULL,
+  `name` varchar(63) NOT NULL,
+  `notes` varchar(255) NOT NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='User Defined IP Address Ranges';
+
diff --git a/www/include/js/global.js b/www/include/js/global.js
@@ -45,6 +45,39 @@ function updatednsinfo(window_name) {
 }
 
 
+// Found this on http://www.redips.net/
+// Clear elements of a form that is passed in
+function clearElements(el){
+    var object = new Array();
+    object[0] = document.getElementById(el).getElementsByTagName('input');
+    object[1] = document.getElementById(el).getElementsByTagName('textarea');
+    object[2] = document.getElementById(el).getElementsByTagName('select');
+  var type = null;
+  for (x=0; x<object.length; x++){
+    for (y=0; y<object[x].length; y++){
+      type = object[x][y].type
+      switch(type){
+        case "text":
+        case "textarea":
+        case "password":
+          object[x][y].value = "";
+          break;
+        case "radio":
+        case "checkbox":
+          object[x][y].checked = "";
+          break;
+        case "select-one":
+          object[x][y].options[0].selected = true;
+          break;
+        case "select-multiple":
+          for (z=0; z<object[x][y].options.length; z++){
+            object[x][y].options[z].selected = false;
+          }
+        break;
+      }
+    }
+  }
+}
 
 
 //

diff --git a/www/winc/search_results.inc.php b/www/winc/search_results.inc.php
@@ -128,7 +128,7 @@ class="filter"
             <u>B</u>lock name
         </td>
         <td align="left" class="asearch-line">
-            <input id="blocks_field1" name="blockname" type="text" class="edit" size="35" accesskey="b" />
+            <input id="blocks_field1" name="blockname" type="text" class="edit" size="35" accesskey="b" value="{$form['blockname']}" />
             <div id="suggest_hostname" class="suggest"></div>
         </td>
     </tr>
@@ -138,7 +138,7 @@ class="filter"
             &nbsp;
         </td>
         <td align="right" class="asearch-line">
-            <input class="button" type="reset" name="reset" value="Clear">
+            <input class="button" type="button" name="clear" value="Clear" onClick="clearElements('block_search_form');">
             <input class="button" type="button" name="search" value="Search" accesskey="s" onClick="xajax_window_submit('search_results', xajax.getFormValues('block_search_form'));">
         </td>
     </tr>
@@ -157,7 +157,7 @@ class="filter"
             <u>C</u>ampus name
         </td>
         <td align="left" class="asearch-line">
-            <input id="vlan_campus_field1" name="campusname" type="text" class="edit" size="35" accesskey="c" />
+            <input id="vlan_campus_field1" name="campusname" type="text" class="edit" size="35" accesskey="c" value="{$form['campusname']}" />
             <div id="suggest_hostname" class="suggest"></div>
         </td>
     </tr>
@@ -167,7 +167,7 @@ class="filter"
             &nbsp;
         </td>
         <td align="right" class="asearch-line">
-            <input class="button" type="reset" name="reset" value="Clear">
+            <input class="button" type="button" name="clear" value="Clear" onClick="clearElements('vlan_campus_search_form');">
             <input class="button" type="button" name="search" value="Search" accesskey="s" onClick="xajax_window_submit('search_results', xajax.getFormValues('vlan_campus_search_form'));">
         </td>
     </tr>
@@ -303,16 +303,16 @@ class="filter"
     </td>
     </tr>
 
-
+    </form>
     <tr>
         <td colspan=4 align="right" class="asearch-line">
-            <input class="button" type="reset" name="reset" value="Clear">
+            <input class="button" type="button" name="reset" value="Clear" onClick="clearElements('host_search_form');">
             <input class="button" type="button" name="search" value="Search" accesskey="s" onClick="xajax_window_submit('search_results', xajax.getFormValues('host_search_form'));">
         </td>
     </tr>
 
     </table>
-    </form>
+
 
 
 
@@ -326,7 +326,7 @@ class="filter"
             <u>V</u>lan
         </td>
         <td align="left" class="asearch-line">
-            <input id="subnets_field1" name="vlandesc" type="text" class="edit" size="32" accesskey="v" />
+            <input id="subnets_field1" name="vlandesc" type="text" class="edit" size="32" accesskey="v" value="{$form['vlandesc']}" />
         </td>
     </tr>
 
@@ -346,7 +346,7 @@ class="filter"
             Subnet <u>N</u>ame
         </td>
         <td align="left" class="asearch-line">
-            <input id="subnet" name="subnetname" type="text" class="edit" size="32" accesskey="n" />
+            <input id="subnet" name="subnetname" type="text" class="edit" size="32" accesskey="n" value="{$form['subnetname']}" />
             <div id="suggest_subnet" class="suggest"></div>
         </td>
     </tr>
@@ -356,10 +356,10 @@ class="filter"
             <u>I</u>P Address
         </td>
         <td align="left" class="asearch-line" nowrap="true">
-            <input id="ip_subnet" name="ip_subnet" class="edit" type="text" size="15" accesskey="i" />
+            <input id="ip_subnet" name="ip_subnet" class="edit" type="text" size="15" accesskey="i" value="{$form['ip_subnet']}" />
             <div id="suggest_ip_subnet" class="suggest"></div>
             thru
-            <input id="ip_subnet_thru" name="ip_subnet_thru" class="edit" type="text" size="15">
+            <input id="ip_subnet_thru" name="ip_subnet_thru" class="edit" type="text" size="15" value="{$form['ip_subnet_thru']}" />
             <div id="suggest_ip_subnet_thru" class="suggest"></div>
         </td>
     </tr>
@@ -369,8 +369,8 @@ class="filter"
             &nbsp;
         </td>
         <td align="right" class="asearch-line">
-            <input class="button" type="reset" name="reset" value="Clear">
-            <input class="button" type="submit" name="search" value="Search" accesskey="s" onClick="toggle_window('{$window_name}'); xajax_window_submit('search_results', xajax.getFormValues('subnet_search_form'));">
+            <input class="button" type="button" name="reset" value="Clear" onClick="clearElements('subnet_search_form');">
+            <input class="button" type="button" name="search" value="Search" accesskey="s" onClick="xajax_window_submit('search_results', xajax.getFormValues('subnet_search_form'));">
         </td>
     </tr>
 
@@ -488,6 +488,9 @@ function(ev) {
 
         /* Display the list of results */
         xajax_window_submit('list_' + el('{$form_id}_tab').value, xajax.getFormValues('{$form_id}'), 'display_list');
+
+
+
 EOL;