Changeset 825 for trunk/Modules/Network

Timestamp:

Apr 16, 2016, 9:53:17 PM (9 years ago)

Author:

chronos

Message:

• Added: Allow to independently select table page and column order. This solves a problem where going between pages with tables incorrectly set default ordering column.

Location:

trunk/Modules/Network

Files:

• Network.php (modified) (2 diffs)
• Subnet.php (modified) (2 diffs)

trunk/Modules/Network/Network.php

@@ -208 +208 @@
         'Wireless' => array('Type' => 'TNetworkInterfaceWirelessListInterface', 'Caption' => 'Bezdrátové spoje', 'Default' => ''),
         'Ports' => array('Type' => 'TDevicePortListInterface', 'Caption' => 'Síťové porty', 'Default' => ''),
-        'Latency' => array('Type' => 'TDeviceInterfaceLatencyListInterface', 'Caption' => 'Odezva sítě', 'Default' => ''),
+        'Latency' => array('Type' => 'TDeviceInterfaceLatencyListInterface', 'Caption' => 'Síťová odezva', 'Default' => ''),
       ),
       'AfterInsert' => array($this, 'AfterInsertNetworkInterface'),
@@ -261 +261 @@
     ));
     $this->System->FormManager->RegisterClass('NetworkInterfaceLatency', array(
-      'Title' => 'Sťová odezva',
+      'Title' => 'Síťová odezva',
       'Table' => 'NetworkInterfaceLatency',
+      'DefaultSortColumn' => 'Time',
+      'DefaultSortOrder' => 1,
       'Items' => array(
         'Time' => array('Type' => 'DateTime', 'Caption' => 'Čas', 'Default' => ''),

trunk/Modules/Network/Subnet.php

@@ -15 +15 @@
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM `NetworkSubnet`');
     $DbRow = $DbResult->fetch_row();
-    $PageList = GetPageList($DbRow[0]);
+    $PageList = GetPageList('Subnets', $DbRow[0]);
 
     $Output = $PageList['Output'];
@@ -30 +30 @@
       array('Name' => 'SubjectName', 'Title' => 'Účastník'),
     );
-    $Order = GetOrderTableHeader($TableColumns, 'AddressRange', 0);
+    $Order = GetOrderTableHeader('Subnets', $TableColumns, 'AddressRange', 0);
     $Output .= $Order['Output'];