Merge pull request #131 from chris03/fix/node-list-last-ip

Fix to show the current IP in the (simple search) node list
inverse-inc · Apr 2, 2014 · 7fa605f · 7fa605f
2 parents f77e3c4 + 1ed6ccc
commit 7fa605f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/pf/node.pm b/lib/pf/node.pm
@@ -247,7 +247,7 @@ sub node_db_prepare {
             LEFT JOIN os_type ON dhcp_fingerprint.os_id = os_type.os_id
             LEFT JOIN violation ON node.mac=violation.mac AND violation.status = 'open'
             LEFT JOIN locationlog ON node.mac=locationlog.mac AND end_time IS NULL
-            LEFT JOIN iplog ON node.mac=iplog.mac AND iplog.end_time = '0000-00-00 00:00:00'
+            LEFT JOIN iplog ON node.mac=iplog.mac AND (iplog.end_time = '0000-00-00 00:00:00' OR iplog.end_time > NOW())
         GROUP BY node.mac
     ];