Merge pull request inex#618 from inex/fix-sorting-ip

[Bf] - fix IP sorting - fixes inex#21
listerr · Feb 10, 2020 · fd761ee · fd761ee
2 parents 96ea4c6 + 242496c
commit fd761ee
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/database/Repositories/IPv4Address.php b/database/Repositories/IPv4Address.php
@@ -72,6 +72,7 @@ public function getAllForList( int $vlanid = null )
 
         $dql = "SELECT  ip.id as id, 
                         ip.address as address,
+                        inet_aton(ip.address) as aton,
                         v.name AS vlan, 
                         v.id as vlanid,
                         vli.id AS vliid,

diff --git a/database/Repositories/IPv6Address.php b/database/Repositories/IPv6Address.php
@@ -101,6 +101,7 @@ public function getAllForList( int $vlanid = null )
 
         $dql = "SELECT  ip.id AS id, 
                         ip.address AS address,
+                        hex( inet6_aton( ip.address ) ) as aton,
                         v.name AS vlan, 
                         v.id AS vlanid,
                         vli.id AS vliid,

diff --git a/resources/views/ip-address/list.foil.php b/resources/views/ip-address/list.foil.php
@@ -103,7 +103,7 @@
                     <tbody>
                         <?php foreach( $t->ips as $ip ):?>
                             <tr>
-                                <td>
+                                <td data-order="<?= $t->ee( $ip[ 'aton' ] ) ?>">
                                     <?= $t->ee( $ip[ 'address' ] ) ?>
                                 </td>
                                 <td>
-Original file line number
+Diff line change
@@ Expand Up / @@ -103,7 +103,7 @@ @@
                         <tbody>
                             <?php foreach( $t->ips as $ip ):?>
                                 <tr>
-                                    <td>
+                                    <td data-order="<?= $t->ee( $ip[ 'aton' ] ) ?>">
                                         <?= $t->ee( $ip[ 'address' ] ) ?>
                                     </td>
                                     <td>
@@ Expand Down @@