diff --git a/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/SettingsController.php b/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/SettingsController.php index dd1816945..c47153d92 100644 --- a/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/SettingsController.php +++ b/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/SettingsController.php @@ -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); diff --git a/net/relayd/src/opnsense/mvc/app/views/OPNsense/Relayd/index.volt b/net/relayd/src/opnsense/mvc/app/views/OPNsense/Relayd/index.volt index 71cb81101..8c96a0ec3 100644 --- a/net/relayd/src/opnsense/mvc/app/views/OPNsense/Relayd/index.volt +++ b/net/relayd/src/opnsense/mvc/app/views/OPNsense/Relayd/index.volt @@ -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 ' ' + + '' + + ''; + }, + 'rowtoggle': function (column, row) { + if (parseInt(row[column.id], 2) === 1) { + return ''; + } else { + return ''; + } + }, + } + } }; if (['virtualserver', 'host', 'table'].includes(element)) { endpoints['toggle'] = '/api/relayd/settings/toggle/' + element + '/'; @@ -342,6 +365,8 @@ POSSIBILITY OF SUCH DAMAGE. {{ lang._('Enabled') }} {{ lang._('Name') }} {{ lang._('Type') }} + {{ lang._('Adress') }} + {{ lang._('Port') }} {{ lang._('ID') }} {{ lang._('Edit') }} | {{ lang._('Delete') }}