upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-05-28 04:34:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

net/relayd - add listen address and port (range) to Virtual Server tab. closes https://github.com/opnsense/plugins/issues/2959 (#2960)

Browse source
This commit is contained in:
Ad Schellevis 2022-04-27 13:00:46 +02:00 committed by GitHub
parent c7fea104ed
commit fd30e06017
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/SettingsController.php
View file

@ -333,19 +333,19 @@ class SettingsController extends ApiMutableModelControllerBase
$fields = array();
switch ($nodeType) {
case 'host':
$fields = array('enabled', 'name', 'address');
$fields = ['enabled', 'name', 'address'];
break;
case 'tablecheck':
$fields = array('name', 'type');
$fields = ['name', 'type'];
break;
case 'table':
$fields = array('enabled', 'name');
$fields = ['enabled', 'name'];
break;
case 'protocol':
$fields = array('name', 'type');
$fields = ['name', 'type'];
break;
case 'virtualserver':
$fields = array('enabled', 'name', 'type');
$fields = ['enabled', 'name', 'type', 'listen_address', 'listen_startport', 'listen_endport'];
break;
}
$result = $grid->fetchBindRequest($this->request, $fields);

27
net/relayd/src/opnsense/mvc/app/views/OPNsense/Relayd/index.volt
View file

@ -101,7 +101,30 @@ POSSIBILITY OF SUCH DAMAGE.
'get': '/api/relayd/settings/get/' + element + '/',
'set': '/api/relayd/settings/set/' + element + '/',
'add': '/api/relayd/settings/set/' + element + '/',
'del': '/api/relayd/settings/del/' + element + '/'
'del': '/api/relayd/settings/del/' + element + '/',
options: {
formatters: {
'listen_port': function (column, row) {
if (row.listen_endport) {
return row.listen_startport + ":" + row.listen_endport;
} else {
return row.listen_startport;
}
},
'commands': function (column, row) {
return '<button type="button" class="btn btn-xs btn-default command-edit bootgrid-tooltip" data-row-id="' + row.uuid + '"><span class="fa fa-fw fa-pencil"></span></button> ' +
'<button type="button" class="btn btn-xs btn-default command-copy bootgrid-tooltip" data-row-id="' + row.uuid + '"><span class="fa fa-fw fa-clone"></span></button>' +
'<button type="button" class="btn btn-xs btn-default command-delete bootgrid-tooltip" data-row-id="' + row.uuid + '"><span class="fa fa-fw fa-trash-o"></span></button>';
},
'rowtoggle': function (column, row) {
if (parseInt(row[column.id], 2) === 1) {
return '<span style="cursor: pointer;" class="fa fa-fw fa-check-square-o command-toggle bootgrid-tooltip" data-value="1" data-row-id="' + row.uuid + '"></span>';
} else {
return '<span style="cursor: pointer;" class="fa fa-fw fa-square-o command-toggle bootgrid-tooltip" data-value="0" data-row-id="' + row.uuid + '"></span>';
}
},
}
}
};
if (['virtualserver', 'host', 'table'].includes(element)) {
endpoints['toggle'] = '/api/relayd/settings/toggle/' + element + '/';
@ -342,6 +365,8 @@ POSSIBILITY OF SUCH DAMAGE.
<th data-column-id="enabled" data-width="6em" data-type="string" data-formatter="rowtoggle">{{ lang._('Enabled') }}</th>
<th data-column-id="name" data-type="string">{{ lang._('Name') }}</th>
<th data-column-id="type" data-type="string">{{ lang._('Type') }}</th>
<th data-column-id="listen_address" data-type="string">{{ lang._('Adress') }}</th>
<th data-column-id="listen_startport" data-formatter="listen_port" data-type="string">{{ lang._('Port') }}</th>
<th data-column-id="uuid" data-type="string" data-identifier="true" data-visible="false">{{ lang._('ID') }}</th>
<th data-column-id="commands" data-width="7em" data-formatter="commands" data-sortable="false">{{ lang._('Edit') }} | {{ lang._('Delete') }}</th>
</tr>