Merge branch 'master' into og-newnetmap

This commit is contained in:
Oliver Gorwits
2017-12-12 23:38:00 +00:00
11 changed files with 109 additions and 107 deletions

View File

@@ -3,7 +3,7 @@
<thead>
<tr>
<th></th>
[% FOREACH item IN vars.port_columns %]
[% FOREACH item IN settings.port_columns %]
[% NEXT IF item.name == 'c_admin' %]
[% NEXT IF item.name == 'c_nodes' AND params.c_nodes AND params.c_neighbors %]
[% NEXT UNLESS params.${item.name} %]

View File

@@ -2,7 +2,7 @@
[% SET headers = [] %]
[% SET c_nodes_pos = -1 %]
[% FOREACH item IN vars.port_columns %]
[% FOREACH item IN settings.port_columns %]
[% NEXT IF item.name == 'c_admin' %]
[% NEXT UNLESS params.${item.name} %]