135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix device port ordering in DataTables when Port Control is enabled

Browse Source
This commit is contained in:
Oliver Gorwits
2014-07-13 18:53:06 +01:00
parent 3a84c28c45
commit 6d8ccca21c
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Netdisco/Changes
View File

@@ -10,6 +10,7 @@
* [ND1#117] unknown devices missing from inventory * [ND1#117] unknown devices missing from inventory
* [#118] Fix table rendering on port search tab when VLAN is null * [#118] Fix table rendering on port search tab when VLAN is null
* Fix truncated port description change (F. Schiavarelli) * Fix truncated port description change (F. Schiavarelli)
* Fix device port ordering in DataTables when Port Control is enabled
2.028000 - 2014-07-01 2.028000 - 2014-07-01

4
Netdisco/share/views/ajax/device/ports.tt
View File

@@ -60,12 +60,14 @@
[% IF user_can_port_control AND params.c_admin %] [% IF user_can_port_control AND params.c_admin %]
[% IF row.up_admin == 'up' %] [% IF row.up_admin == 'up' %]
<td nowrap class="nd_editable-cell" data-action="down" <td nowrap class="nd_editable-cell" data-action="down"
data-order="[% row.port | html_entity %]" data-filter="[% row.port | html_entity %]"
data-field="c_port" data-for-device="[% device.ip | html_entity %]" data-for-port="[% row.port | html_entity %]"> data-field="c_port" data-for-device="[% device.ip | html_entity %]" data-for-port="[% row.port | html_entity %]">
<i class="icon-hand-down nd_hand-icon" <i class="icon-hand-down nd_hand-icon"
rel="tooltip" data-placement="top" data-offset="3" rel="tooltip" data-placement="top" data-offset="3"
data-animation="" data-title="Click to Disable"></i> data-animation="" data-title="Click to Disable"></i>
[% ELSE %] [% ELSE %]
<td nowrap class="nd_editable-cell" data-action="up" <td nowrap class="nd_editable-cell" data-action="up"
data-order="[% row.port | html_entity %]" data-filter="[% row.port | html_entity %]"
data-field="c_port" data-for-device="[% device.ip | html_entity %]" data-for-port="[% row.port | html_entity %]"> data-field="c_port" data-for-device="[% device.ip | html_entity %]" data-for-port="[% row.port | html_entity %]">
<i class="icon-hand-up nd_hand-icon" <i class="icon-hand-up nd_hand-icon"
rel="tooltip" data-placement="top" data-offset="3" rel="tooltip" data-placement="top" data-offset="3"
@@ -78,7 +80,7 @@
data-animation="" data-title="View Port Log"></i> data-animation="" data-title="View Port Log"></i>
</a> </a>
[% ELSE %] [% ELSE %]
<td nowrap> <td nowrap data-order="[% row.port | html_entity %]" data-filter="[% row.port | html_entity %]">
[% END %] [% END %]
<a class="nd_this-port-only nd_port-only-first" href="[% uri_for('/device', <a class="nd_this-port-only nd_port-only-first" href="[% uri_for('/device',
self_options) %]&q=[% params.q | uri %]&f=[% row.port | uri %]&prefer=port"> self_options) %]&q=[% params.q | uri %]&f=[% row.port | uri %]&prefer=port">