diff --git a/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/Api/SettingsController.php b/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/Api/SettingsController.php index 4d011bdce..b29ccbe6d 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/Api/SettingsController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/Api/SettingsController.php @@ -348,7 +348,7 @@ class SettingsController extends ApiControllerBase $grid = new UIModelGrid($mdlShaper->rules->rule); return $grid->fetchBindRequest( $this->request, - array("interface", "proto","source","destination","description","origin","sequence","target"), + array("interface", "proto", "source_not","source", "destination_not", "destination", "description", "origin", "sequence", "target"), "sequence" ); } diff --git a/src/opnsense/mvc/app/views/OPNsense/TrafficShaper/index.volt b/src/opnsense/mvc/app/views/OPNsense/TrafficShaper/index.volt index 7ff0ed465..23dd11fc7 100644 --- a/src/opnsense/mvc/app/views/OPNsense/TrafficShaper/index.volt +++ b/src/opnsense/mvc/app/views/OPNsense/TrafficShaper/index.volt @@ -64,7 +64,32 @@ POSSIBILITY OF SUCH DAMAGE. get:'/api/trafficshaper/settings/getRule/', set:'/api/trafficshaper/settings/setRule/', add:'/api/trafficshaper/settings/addRule/', - del:'/api/trafficshaper/settings/delRule/' + del:'/api/trafficshaper/settings/delRule/', + options: { + converters: { + notprefixable: { + to: function (value) { + value = JSON.parse(value); + var str = ""; + if (value.not) { + str += ' '; + } + str += value.val; + return str; + } + } + }, + responseHandler: function (response) { + // concatenate fields for not. + if ('rows' in response) { + for (var i = 0; i < response.rowCount; i++) { + response.rows[i]['displaysrc'] = JSON.stringify({'not':response.rows[i].source_not == '1', 'val':response.rows[i].source}) + response.rows[i]['displaydst'] = JSON.stringify({'not':response.rows[i].destination_not == '1', 'val':response.rows[i].destination}) + } + } + return response; + } + } } ); @@ -204,8 +229,8 @@ POSSIBILITY OF SUCH DAMAGE. {{ lang._('Origin') }} {{ lang._('Interface') }} {{ lang._('Protocol') }} - {{ lang._('Source') }} - {{ lang._('Destination') }} + {{ lang._('Source') }} + {{ lang._('Destination') }} {{ lang._('Target') }} {{ lang._('Description') }} {{ lang._('Commands') }}