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

Use custom portsort plug-in for DataTables in device ports tab

Browse Source
This commit is contained in:
Eric A. Miller
2014-08-12 18:52:11 -04:00
parent 8cc9e64c9a
commit 746d500175
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Netdisco/Changes
View File

@@ -1,3 +1,9 @@
2.029005
[ENHANCEMENTS]
* Custom portsort plug-in for DataTables
2.029004 - 2014-08-11 2.029004 - 2014-08-11
[BUG FIXES] [BUG FIXES]

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

@@ -9,9 +9,9 @@
[% NEXT UNLESS params.${item.name} %] [% NEXT UNLESS params.${item.name} %]
[% SET th_class = '' %] [% SET th_class = '' %]
[% IF (user_can_port_control AND params.c_admin AND (item.name == 'c_port' OR item.name == 'c_name')) %] [% IF (user_can_port_control AND params.c_admin AND (item.name == 'c_port' OR item.name == 'c_name')) %]
[% th_class = ' class="nd_nudge-for-icon natural"' %] [% th_class = ' class="nd_nudge-for-icon portsort"' %]
[% ELSIF (item.name == 'c_port' OR item.name == 'c_descr' OR item.name == 'c_name') %] [% ELSIF (item.name == 'c_port' OR item.name == 'c_descr' OR item.name == 'c_name') %]
[% th_class = ' class="natural"' %] [% th_class = ' class="portsort"' %]
[% END %] [% END %]
<th[% th_class %]> <th[% th_class %]>
[% item.label | html_entity %] [% item.label | html_entity %]
@@ -396,7 +396,7 @@ $(document).ready(function() {
"columnDefs": [ "columnDefs": [
{ "sortable": false, "targets": 0 }, { "sortable": false, "targets": 0 },
{ "searchable": false, "targets": 0 }, { "searchable": false, "targets": 0 },
{ "type": 'natural', "targets": [ 'natural' ] } { "type": 'portsort', "targets": [ 'portsort' ] }
], ],
"order": [[ 1, 'asc' ]], "order": [[ 1, 'asc' ]],
"processing": true, "processing": true,

1
Netdisco/share/views/layouts/main.tt
View File

@@ -31,6 +31,7 @@
<script type="text/javascript" src="[% uri_base %]/javascripts/dataTables.ip-address-sort.js"></script> <script type="text/javascript" src="[% uri_base %]/javascripts/dataTables.ip-address-sort.js"></script>
<script type="text/javascript" src="[% uri_base %]/javascripts/he.js"></script> <script type="text/javascript" src="[% uri_base %]/javascripts/he.js"></script>
<script type="text/javascript" src="[% uri_base %]/javascripts/natural.js"></script> <script type="text/javascript" src="[% uri_base %]/javascripts/natural.js"></script>
<script type="text/javascript" src="[% uri_base %]/javascripts/portsort.js"></script>
<script type="text/javascript"> <script type="text/javascript">
var uri_base = '[% uri_base %]'; var uri_base = '[% uri_base %]';