git://scientific.zcu.cz
/
now.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
702f71d
)
Tuning of the network get: fix description, look also into the template.
author
František Dvořák
<valtri@civ.zcu.cz>
Tue, 13 Sep 2016 14:48:53 +0000
(16:48 +0200)
committer
František Dvořák
<valtri@civ.zcu.cz>
Tue, 13 Sep 2016 14:48:53 +0000
(16:48 +0200)
lib/nebula.rb
patch
|
blob
|
blame
|
history
diff --git
a/lib/nebula.rb
b/lib/nebula.rb
index
4eee867
..
a49d3b7
100644
(file)
--- a/
lib/nebula.rb
+++ b/
lib/nebula.rb
@@
-186,9
+186,9
@@
module Now
id = vn.id
title = vn.name
- desc = vn['
SUMMARY
']
+ desc = vn['
DESCRIPTION'] || vn['TEMPLATE/DESCRIPTION
']
desc && desc.empty? && desc = nil
- vlan = vn['VLAN_ID']
+ vlan = vn['VLAN_ID']
|| vn['TEMPLATE/VLAN_ID']
vlan && vlan.empty? && vlan = nil
range = parse_ranges(id, vn)
@@
-198,7
+198,7
@@
module Now
title: title,
description: desc,
user: vn['UNAME'],
- bridge: vn['BRIDGE'],
+ bridge: vn['BRIDGE']
|| vn['TEMPLATE/BRIDGE']
,
vlan: vlan,
range: range,
zone: zone