Commit 8f69e381 authored by Dietmar Maurer's avatar Dietmar Maurer

white space cleanup

parent f2f1a82d
...@@ -159,7 +159,7 @@ Ext.define('PVE.Parser', { statics: { ...@@ -159,7 +159,7 @@ Ext.define('PVE.Parser', { statics: {
errors = true; errors = true;
return false; // break return false; // break
} }
if (match_res[1]==='bridge'){ if (match_res[1] === 'bridge'){
var bridgevlanf = match_res[2]; var bridgevlanf = match_res[2];
var bridge_res = bridgevlanf.match(/^(vmbr(\d+))(v(\d+))?(f)?$/); var bridge_res = bridgevlanf.match(/^(vmbr(\d+))(v(\d+))?(f)?$/);
if (!bridge_res) { if (!bridge_res) {
...@@ -168,10 +168,8 @@ Ext.define('PVE.Parser', { statics: { ...@@ -168,10 +168,8 @@ Ext.define('PVE.Parser', { statics: {
} }
data['bridge'] = bridge_res[1]; data['bridge'] = bridge_res[1];
data['tag'] = bridge_res[4]; data['tag'] = bridge_res[4];
if(bridge_res[5]){ data['firewall'] = bridge_res[5] ? 1 : 0;
data['firewall'] = 1; } else {
}
}else{
data[match_res[1]] = match_res[2]; data[match_res[1]] = match_res[2];
} }
}); });
...@@ -196,14 +194,13 @@ Ext.define('PVE.Parser', { statics: { ...@@ -196,14 +194,13 @@ Ext.define('PVE.Parser', { statics: {
var tmparray = []; var tmparray = [];
Ext.Array.each(['ifname', 'mac', 'bridge', 'host_ifname' , 'host_mac', 'mac_filter', 'tag', 'firewall'], function(key) { Ext.Array.each(['ifname', 'mac', 'bridge', 'host_ifname' , 'host_mac', 'mac_filter', 'tag', 'firewall'], function(key) {
var value = data[key]; var value = data[key];
if(key === 'bridge'){ if (key === 'bridge'){
if(data['tag']){ if(data['tag']){
value = value + 'v' + data['tag']; value = value + 'v' + data['tag'];
} }
if(data['firewall']){ if (data['firewall']){
value = value + 'f'; value = value + 'f';
} }
} }
if (value) { if (value) {
tmparray.push(key + '=' + value); tmparray.push(key + '=' + value);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment