[pve-devel] [PATCH manager] lxc: disable ACL settings for bind mounts

Wolfgang Bumiller w.bumiller at proxmox.com
Mon Mar 14 14:50:47 CET 2016


---
We already disable the quota element, but bind mounts also can't get
their own ACL setting...
 www/manager/lxc/ResourceEdit.js  | 21 +++++++++++++--------
 www/manager6/lxc/ResourceEdit.js | 21 +++++++++++++--------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/www/manager/lxc/ResourceEdit.js b/www/manager/lxc/ResourceEdit.js
index 04560e4..e7ea404 100644
--- a/www/manager/lxc/ResourceEdit.js
+++ b/www/manager/lxc/ResourceEdit.js
@@ -241,6 +241,8 @@ Ext.define('PVE.lxc.MountPointInputPanel', {
 	if (mp.type === 'bind') {
 	    me.quota.setDisabled(true);
 	    me.quota.setValue(false);
+	    me.acl.setDisabled(true);
+	    me.acl.setValue('Default');
 	}
 
 	me.setValues(mp);
@@ -335,6 +337,8 @@ Ext.define('PVE.lxc.MountPointInputPanel', {
 		    if (me.mpdata.type === 'bind') {
 			me.quota.setDisabled(true);
 			me.quota.setValue(false);
+			me.acl.setDisabled(true);
+			me.acl.setValue('Default');
 			return;
 		    }
 		    var rec = f.store.getById(value);
@@ -428,6 +432,14 @@ Ext.define('PVE.lxc.MountPointInputPanel', {
 	    });
 	}
 
+	me.acl = Ext.createWidget('pveKVComboBox', {
+	    name: 'acl',
+	    fieldLabel: gettext('ACLs'),
+	    data: [['Default', 'Default'], ['1', 'On'], ['0', 'Off']],
+	    value: 'Default',
+	    allowBlank: true
+	});
+
 	me.quota = Ext.createWidget('pvecheckbox', {
 	    name: 'quota',
 	    defaultValue: 0,
@@ -442,14 +454,7 @@ Ext.define('PVE.lxc.MountPointInputPanel', {
 		fieldLabel: gettext('Read-only'),
 		hidden: me.insideWizard
 	    },
-	    {
-		xtype: 'pveKVComboBox',
-		name: 'acl',
-		fieldLabel: gettext('ACLs'),
-		data: [['Default', 'Default'], ['1', 'On'], ['0', 'Off']],
-		value: 'Default',
-		allowBlank: true
-	    },
+	    me.acl,
 	    me.quota
 	];
 
diff --git a/www/manager6/lxc/ResourceEdit.js b/www/manager6/lxc/ResourceEdit.js
index 6fa56f0..8345e20 100644
--- a/www/manager6/lxc/ResourceEdit.js
+++ b/www/manager6/lxc/ResourceEdit.js
@@ -241,6 +241,8 @@ Ext.define('PVE.lxc.MountPointInputPanel', {
 	if (mp.type === 'bind') {
 	    me.quota.setDisabled(true);
 	    me.quota.setValue(false);
+	    me.acl.setDisabled(true);
+	    me.acl.setValue('Default');
 	}
 
 	me.setValues(mp);
@@ -338,6 +340,8 @@ Ext.define('PVE.lxc.MountPointInputPanel', {
 		    if (me.mpdata.type === 'bind') {
 			me.quota.setDisabled(true);
 			me.quota.setValue(false);
+			me.acl.setDisabled(true);
+			me.acl.setValue('Default');
 			return;
 		    }
 		    var rec = f.store.getById(value);
@@ -431,6 +435,14 @@ Ext.define('PVE.lxc.MountPointInputPanel', {
 	    });
 	}
 
+	me.acl = Ext.createWidget('pveKVComboBox', {
+	    name: 'acl',
+	    fieldLabel: gettext('ACLs'),
+	    comboItems: [['Default', 'Default'], ['1', 'On'], ['0', 'Off']],
+	    value: 'Default',
+	    allowBlank: true
+	});
+
 	me.quota = Ext.createWidget('pvecheckbox', {
 	    name: 'quota',
 	    defaultValue: 0,
@@ -445,14 +457,7 @@ Ext.define('PVE.lxc.MountPointInputPanel', {
 		fieldLabel: gettext('Read-only'),
 		hidden: me.insideWizard
 	    },
-	    {
-		xtype: 'pveKVComboBox',
-		name: 'acl',
-		fieldLabel: gettext('ACLs'),
-		comboItems: [['Default', 'Default'], ['1', 'On'], ['0', 'Off']],
-		value: 'Default',
-		allowBlank: true
-	    },
+	    me.acl,
 	    me.quota
 	];
 
-- 
2.1.4





More information about the pve-devel mailing list