Răsfoiți Sursa

change display connected port in edit connection page

Roman Dmitriev 2 ani în urmă
părinte
comite
15b3301f12
2 a modificat fișierele cu 4 adăugiri și 4 ștergeri
  1. 3 3
      html/inc/common.php
  2. 1 1
      html/inc/devtypesfilter.php

+ 3 - 3
html/inc/common.php

@@ -1053,10 +1053,10 @@ function compact_port_name($port)
 function print_device_port_select($db, $field_name, $device_id, $target_id)
 {
     print "<select name=\"$field_name\" class=\"js-select-single\">\n";
-    if (!isset($target_id)) {
+    if (empty($target_id)) {
         $target_id = 0;
     }
-    if (!isset($device_id)) {
+    if (empty($device_id)) {
         $device_id = 0;
     }
     $d_sql = "SELECT D.device_name, DP.port, DP.device_id, DP.id, DP.ifName FROM devices AS D, device_ports AS DP WHERE D.deleted=0 and D.id = DP.device_id AND (DP.device_id<>$device_id or DP.id=$target_id) and (DP.id not in (select target_port_id FROM device_ports WHERE target_port_id>0 and target_port_id<>$target_id)) ORDER BY D.device_name,DP.port";
@@ -1066,7 +1066,7 @@ function print_device_port_select($db, $field_name, $device_id, $target_id)
         if (empty($f_ifname)) {
             $f_ifname = $f_port;
         }
-        print_select_item($f_name . "[" . compact_port_name($f_ifname) . "]", $f_target_id, $target_id);
+        print_select_item($f_name . "[" . $f_port."] - " . compact_port_name($f_ifname), $f_target_id, $target_id);
     }
     print "</select>\n";
 }

+ 1 - 1
html/inc/devtypesfilter.php

@@ -4,7 +4,7 @@ if (isset($_POST['devtypes']) or isset($_GET['devtypes'])) {
     if (isset($_GET['devtypes'])) { $f_devtype_id = $_GET['devtypes']*1; }
     if (isset($_POST['devtypes'])) { $f_devtype_id = $_POST['devtypes']*1; }
     } else {
-    if (isset($_SESSION[$page_url]['devtypes'])) { $f_devtype_id=$_SESSION[$page_url]['devtypes']; } else { $f_devtype_id = 0; }
+    if (isset($_SESSION[$page_url]['devtypes'])) { $f_devtype_id=$_SESSION[$page_url]['devtypes']; } else { $f_devtype_id = -1; }
     }
 $_SESSION[$page_url]['devtypes']=$f_devtype_id;
 ?>