From ac963f296e915ecfa2dd66184667e9218bd5a443 Mon Sep 17 00:00:00 2001
From: Lucas Nussbaum <lucas.nussbaum@loria.fr>
Date: Thu, 5 Jul 2018 13:37:29 +0200
Subject: [PATCH] wikigen: only display name once when name == device
---
generators/wiki/lib/generators/site_hardware.rb | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/generators/wiki/lib/generators/site_hardware.rb b/generators/wiki/lib/generators/site_hardware.rb
index 0ac1884712a..a73d008656a 100644
--- a/generators/wiki/lib/generators/site_hardware.rb
+++ b/generators/wiki/lib/generators/site_hardware.rb
@@ -257,7 +257,11 @@ def get_hardware(sites)
hard['network_description'] = network_description.map do |e|
s = e['count'] > 1 ? "\n* " : ''
s += e['unavailable_for_experiment'] ? '<span style="color:grey">' : ''
- s += e['name'].nil? ? e['device'] : e['device'] + "/" + e['name']
+ if e['name'].nil? or e['name'] == e['device']
+ s += e['device']
+ else
+ s += e['device'] + "/" + e['name']
+ end
s += ', '
s += e['interface']
s += ', '
--
GitLab