lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-15 09:04:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2006 from fabianfrz/ts_show_not

Browse Source 
traffic shaper: add a ! for negated fields
This commit is contained in:
Ad Schellevis 2017-12-19 19:12:59 +01:00 committed by GitHub
commit f2a263b74b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/Api/SettingsController.php
View File

@ -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"
);
}

31
src/opnsense/mvc/app/views/OPNsense/TrafficShaper/index.volt
View File

@ -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 += '<i class="fa fa-exclamation"></i> ';
}
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.
<th data-column-id="origin" data-type="string" data-visible="false">{{ lang._('Origin') }}</th>
<th data-column-id="interface" data-type="string">{{ lang._('Interface') }}</th>
<th data-column-id="proto" data-type="string">{{ lang._('Protocol') }}</th>
<th data-column-id="source" data-type="string">{{ lang._('Source') }}</th>
<th data-column-id="destination" data-type="string">{{ lang._('Destination') }}</th>
<th data-column-id="displaysrc" data-type="notprefixable">{{ lang._('Source') }}</th>
<th data-column-id="displaydst" data-type="notprefixable">{{ lang._('Destination') }}</th>
<th data-column-id="target" data-type="string">{{ lang._('Target') }}</th>
<th data-column-id="description" data-type="string">{{ lang._('Description') }}</th>
<th data-column-id="commands" data-width="7em" data-formatter="commands" data-sortable="false">{{ lang._('Commands') }}</th>