Begin use of Dropdown::show() instead of dropdownValue(). See release f…

…usioninventory#47
ddurieux · Apr 27, 2010 · fed5a1d · fed5a1d
1 parent 431e50a
commit fed5a1d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/hook.php b/hook.php
@@ -1490,7 +1490,11 @@ function plugin_fusioninventory_MassiveActionsDisplay($type, $action) {
                   while ($data_models=$DB->fetch_array($result_models)) {
                      $exclude_models[] = $data_models['ID'];
                   }
-                  dropdownValue("glpi_plugin_fusioninventory_model_infos", "snmp_model", "name",0,-1,'',$exclude_models);
+                  Dropdown::show("PluginFusionInventoryModelInfos",
+                                 array('name' => "snmp_model",
+                                       'value' => "name",
+                                       'comments' => false,
+                                       'used' => $exclude_models));
                   echo "<input type=\"submit\" name=\"massiveaction\" class=\"submit\" value=\"" . $LANG["buttons"][2] . "\" >";
                }
                break;
@@ -1530,7 +1534,11 @@ function plugin_fusioninventory_MassiveActionsDisplay($type, $action) {
                   while ($data_models=$DB->fetch_array($result_models)) {
                      $exclude_models[] = $data_models['ID'];
                   }
-                  dropdownValue("glpi_plugin_fusioninventory_model_infos", "snmp_model", "name",0,-1,'',$exclude_models);
+                  Dropdown::show("PluginFusionInventoryModelInfos",
+                                 array('name' => "snmp_model",
+                                       'value' => "name",
+                                       'comments' => false,
+                                       'used' => $exclude_models));
                   echo "<input type=\"submit\" name=\"massiveaction\" class=\"submit\" value=\"" . $LANG["buttons"][2] . "\" >";
                }
                break;
@@ -1657,12 +1665,15 @@ function plugin_fusioninventory_MassiveActionsFieldsDisplay($type,$table,$field,
 	switch ($table.".".$field) {
 
 		case 'glpi_plugin_fusioninventory_snmp_connection.name':
-			dropdownValue("glpi_plugin_fusioninventory_snmp_connection",$linkfield);
+			Dropdown::show("PluginFusionInventorySNMPAuth",
+                        array('name' => $linkfield));
 			return true;
 			break;
 
 		case 'glpi_plugin_fusioninventory_model_infos.name':
-			dropdownValue("glpi_plugin_fusioninventory_model_infos",$linkfield,'',0);
+			Dropdown::show("PluginFusionInventoryModelInfos",
+                        array('name' => $linkfield,
+                              'comments' => false));
 			return true;
 			break;
 
@@ -1678,7 +1689,9 @@ function plugin_fusioninventory_MassiveActionsFieldsDisplay($type,$table,$field,
 			break;
 
 		case 'glpi_plugin_fusioninventory_agents.ID' :
-			dropdownValue("glpi_plugin_fusioninventory_agents",$linkfield,'',0);
+			Dropdown::show("PluginFusionInventoryAgents",
+                        array('name' => $linkfield,
+                              'comments' => false));
 			return true;
 			break;
 

diff --git a/inc/mibnetworking.class.php b/inc/mibnetworking.class.php
@@ -220,6 +220,9 @@ function showForm($target,$ID) {
 
 				echo "<td align='center'>";
 				dropdownValue("glpi_dropdown_plugin_fusioninventory_mib_label","FK_mib_label",0,1);
+//				Dropdown::show("PluginFusioninventoryMib_Label",
+//                           array('name' => "FK_mib_label",
+//                                 'value' => 0));
 				echo "</td>";
 
 				echo "<td align='center'>";

diff --git a/report/plugin_fusioninventory.ports_date_connections.php b/report/plugin_fusioninventory.ports_date_connections.php
@@ -124,7 +124,9 @@ function displaySearchForm() {
 
 	echo "<td>".$LANG["common"][15]."</td>";
 	echo "<td>";
-	dropdownValue("glpi_dropdown_locations","location",(isset($_GET["location"])?$_GET["location"]:""));
+	Dropdown::show("Location",
+                  array('name' => "location",
+                        'value' => (isset($_GET["location"])?$_GET["location"]:"")));
 	echo "</td>";
 
 	// Display Reset search