Commit 445ed928 authored by Dietmar Maurer's avatar Dietmar Maurer

lxc GUI: enable firewall and vlan tag

parent 7643161b
...@@ -233,7 +233,7 @@ Ext.define('PVE.Parser', { statics: { ...@@ -233,7 +233,7 @@ Ext.define('PVE.Parser', { statics: {
if (!p || p.match(/^\s*$/)) { if (!p || p.match(/^\s*$/)) {
return; // continue return; // continue
} }
var match_res = p.match(/^(bridge|hwaddr|mtu|name|ip|ip6|gw|gw6)=(\S+)$/); var match_res = p.match(/^(bridge|hwaddr|mtu|name|ip|ip6|gw|gw6|firewall|tag)=(\S+)$/);
if (!match_res) { if (!match_res) {
// todo: simply ignore errors ? // todo: simply ignore errors ?
return; // continue return; // continue
...@@ -247,7 +247,7 @@ Ext.define('PVE.Parser', { statics: { ...@@ -247,7 +247,7 @@ Ext.define('PVE.Parser', { statics: {
printLxcNetwork: function(data) { printLxcNetwork: function(data) {
var tmparray = []; var tmparray = [];
Ext.Array.each(['bridge', 'hwaddr', 'mtu', 'name', 'ip', Ext.Array.each(['bridge', 'hwaddr', 'mtu', 'name', 'ip',
'gw', 'ip6', 'gw6'], function(key) { 'gw', 'ip6', 'gw6', 'firewall', 'tag'], function(key) {
var value = data[key]; var value = data[key];
if (value) { if (value) {
tmparray.push(key + '=' + value); tmparray.push(key + '=' + value);
......
...@@ -136,14 +136,12 @@ Ext.define('PVE.lxc.NetworkInputPanel', { ...@@ -136,14 +136,12 @@ Ext.define('PVE.lxc.NetworkInputPanel', {
{ {
xtype: 'pveVlanField', xtype: 'pveVlanField',
name: 'tag', name: 'tag',
disabled: true,
value: cdata.tag, value: cdata.tag,
}, },
{ {
xtype: 'pvecheckbox', xtype: 'pvecheckbox',
fieldLabel: gettext('Firewall'), fieldLabel: gettext('Firewall'),
name: 'firewall', name: 'firewall',
disabled: true,
checked: cdata.firewall, checked: cdata.firewall,
} }
]; ];
......
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