[Netdisco-ng-commit] [git push] Netdisco II branch master updated. 2.029005-7-gfb7bcbf

[Oliver G. <no...@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Netdisco II".

The branch, master has been updated
       via  fb7bcbf120627740bd2db39a29c24ec6f9752c5c (commit)
      from  4c08de951235ad5dbb1ee9f8617b930956c108d8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://sourceforge.net/p/netdisco/netdisco-ng/ci/fb7bcbf120627740bd2db39a29c24ec6f9752c5c/

commit fb7bcbf120627740bd2db39a29c24ec6f9752c5c
Author: Oliver Gorwits <ol...@cp...>
Date:   Mon Aug 25 17:13:11 2014 +0100

    fix undef data error in JS, and when no remote_(ip|port)

diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Virtual/NodesDiscovered.pm b/Netdisco/lib/App/Netdisco/DB/Result/Virtual/NodesDiscovered.pm
index 1000c27..1b8a39b 100644
--- a/Netdisco/lib/App/Netdisco/DB/Result/Virtual/NodesDiscovered.pm
+++ b/Netdisco/lib/App/Netdisco/DB/Result/Virtual/NodesDiscovered.pm
@@ -33,8 +33,7 @@ WHERE d.ip = p.ip
      WHERE a.alias = p.remote_ip
        AND q.ip = a.ip
        AND q.port = p.remote_port)
-  AND p.remote_ip IS NOT NULL
-  AND p.remote_port IS NOT NULL
+  AND (p.remote_id IS NOT NULL OR p.remote_type IS NOT NULL)
 ENDSQL
 );
 
diff --git a/Netdisco/share/views/ajax/report/nodesdiscovered.tt b/Netdisco/share/views/ajax/report/nodesdiscovered.tt
index 3826f53..f5a2809 100644
--- a/Netdisco/share/views/ajax/report/nodesdiscovered.tt
+++ b/Netdisco/share/views/ajax/report/nodesdiscovered.tt
@@ -33,7 +33,7 @@ $(document).ready(function() {
         "type": 'portsort',
         "render": function(data, type, row, meta) {
           return type === 'display' ?
-            '<a href="[% device_ports %]&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(data) + '">' + he.encode(data) + '</a>' :
+            '<a href="[% device_ports %]&c_nodes=on&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(data) + '">' + he.encode(data) + '</a>' :
             data;
         }
       }, {
@@ -44,7 +44,7 @@ $(document).ready(function() {
       }, {
         "data": 'remote_ip',
         "render": function(data, type, row, meta) {
-          return '<a href="[% search_node %]&q=' + encodeURIComponent(data) + '">' + he.encode(data) + '</a>';
+          return '<a href="[% search_node %]&q=' + encodeURIComponent(data || '') + '">' + he.encode(data || '') + '</a>';
         }
       }, {
         "data": 'remote_port',

-----------------------------------------------------------------------

Summary of changes:
 .../Netdisco/DB/Result/Virtual/NodesDiscovered.pm  |    3 +--
 .../share/views/ajax/report/nodesdiscovered.tt     |    4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Netdisco II