]> git.proxmox.com Git - pve-manager.git/commitdiff
lxc: disable ACL settings for bind mounts
authorWolfgang Bumiller <w.bumiller@proxmox.com>
Mon, 14 Mar 2016 13:50:47 +0000 (14:50 +0100)
committerDietmar Maurer <dietmar@proxmox.com>
Mon, 14 Mar 2016 16:28:59 +0000 (17:28 +0100)
www/manager/lxc/ResourceEdit.js
www/manager6/lxc/ResourceEdit.js

index 04560e4d2ec630e16621cab4cdb30beba008ae5e..e7ea40431f74e8305d5f6351c406fb1cae315143 100644 (file)
@@ -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
        ];
 
index 6fa56f0da51e2168eae41a82659103733bff5cdb..8345e20fa7ad21c36bd746c78a95d98fa961ae43 100644 (file)
@@ -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
        ];