Include plugin templates

Fix variable scoping in stateLoadParams
This commit is contained in:
Eric A. Miller
2014-08-14 21:05:52 -04:00
parent 7e35003914
commit 9de265700e

View File

@@ -19,11 +19,9 @@ $(document).ready(function() {
"exclude": [ 0 ] "exclude": [ 0 ]
}, },
"stateLoadParams": function (settings, data) { "stateLoadParams": function (settings, data) {
var idx = 0;
[% FOREACH key IN params.keys %] [% FOREACH key IN params.keys %]
[% NEXT UNLESS key.match('^c_') AND !key.match('^c_neighbors') AND params.$key == 'on' %] [% NEXT UNLESS key.match('^c_') AND !key.match('^c_neighbors') AND params.$key == 'on' %]
idx = $('#dp-data-table').DataTable().column( '[% key %]:name' ).index(); data.columns[$('#dp-data-table').DataTable().column( '[% key %]:name' ).index()].visible = true;
data.columns[idx].visible = true;
[% END %] [% END %]
}, },
"columns": [ "columns": [
@@ -57,7 +55,16 @@ $(document).ready(function() {
} }
return cell_str; return cell_str;
} }
}, { },
[% FOREACH config IN settings._extra_device_port_cols %]
[% NEXT UNLESS config.position == 'left' AND params.${config.name} %]
[% TRY %]
[% INCLUDE "plugin/${config.name}/device_port_column.tt" %]
[% CATCH %]
<!-- dummy content required by Template Toolkit TRY -->
[% END %],
[% END %]
{
"title": 'Port', "title": 'Port',
"name": 'c_port', "name": 'c_port',
"data": 'port', "data": 'port',
@@ -102,7 +109,16 @@ $(document).ready(function() {
return he.encode(data || ''); return he.encode(data || '');
} }
} }
}, { },
[% FOREACH config IN settings._extra_device_port_cols %]
[% NEXT UNLESS config.position == 'mid' AND params.${config.name} %]
[% TRY %]
[% INCLUDE "plugin/${config.name}/device_port_column.tt" %]
[% CATCH %]
<!-- dummy content required by Template Toolkit TRY -->
[% END %],
[% END %]
{
"title": 'Description', "title": 'Description',
"name": 'c_descr', "name": 'c_descr',
"visible": false, "visible": false,
@@ -539,7 +555,15 @@ $(document).ready(function() {
"name": 'c_up', "name": 'c_up',
"visible": false, "visible": false,
"data": "up", "data": "up",
} },
[% FOREACH config IN settings._extra_device_port_cols %]
[% NEXT UNLESS config.position == 'right' AND params.${config.name} %]
[% TRY %]
[% INCLUDE "plugin/${config.name}/device_port_column.tt" %]
[% CATCH %]
<!-- dummy content required by Template Toolkit TRY -->
[% END %]
[% END %]
], ],
"data": [% results %] "data": [% results %]
}); });