From 05725073e12facf8d09ebf1a55096c145b072fd1 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Sun, 10 Feb 2013 15:40:33 +0000 Subject: [PATCH] device names do not have domain_suffix trimmed, but nodes do --- Netdisco/Changes | 2 ++ Netdisco/share/views/ajax/device/addresses.tt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Netdisco/Changes b/Netdisco/Changes index 758538c7..8e037668 100644 --- a/Netdisco/Changes +++ b/Netdisco/Changes @@ -3,6 +3,8 @@ [ENHANCEMENTS] * When linking to devices, use the DNS name in preference to the IP + (makes for more attractive navigation search bar, but need to watch for aliases) + * In general, device names do not have domain_suffix trimmed, but nodes do [BUG FIXES] diff --git a/Netdisco/share/views/ajax/device/addresses.tt b/Netdisco/share/views/ajax/device/addresses.tt index 11d38c13..8fba4a97 100644 --- a/Netdisco/share/views/ajax/device/addresses.tt +++ b/Netdisco/share/views/ajax/device/addresses.tt @@ -12,7 +12,7 @@ [% WHILE (row = results.next) %] [% row.alias %] - [% row.dns.remove(settings.domain_suffix) %] + [% row.dns %] [% row.port %] [% row.device_port.name %]