proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-09 22:21:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #1814: do not enable disk related buttons for audit user

Browse Source 
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2019-04-09 13:56:56 +02:00 committed by Thomas Lamprecht
parent 2d41c7e6f2
commit d35b5b2afb
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
www/manager6/lxc/Resources.js
View File

@ -31,6 +31,7 @@ Ext.define('PVE.lxc.RessourceView', {
} }
var caps = Ext.state.Manager.get('GuiCap'); var caps = Ext.state.Manager.get('GuiCap');
var diskCap = caps.vms['VM.Config.Disk'];
var mpeditor = caps.vms['VM.Config.Disk'] ? 'PVE.lxc.MountPointEdit' : undefined; var mpeditor = caps.vms['VM.Config.Disk'] ? 'PVE.lxc.MountPointEdit' : undefined;
@ -238,9 +239,9 @@ Ext.define('PVE.lxc.RessourceView', {
} }
edit_btn.setDisabled(noedit); edit_btn.setDisabled(noedit);
remove_btn.setDisabled(!isDisk || rec.data.key === 'rootfs'); remove_btn.setDisabled(!isDisk || rec.data.key === 'rootfs' || !diskCap);
resize_btn.setDisabled(!isDisk); resize_btn.setDisabled(!isDisk || !diskCap);
move_btn.setDisabled(!isDisk); move_btn.setDisabled(!isDisk || !diskCap);
}; };
@ -277,6 +278,7 @@ Ext.define('PVE.lxc.RessourceView', {
tbar: [ tbar: [
{ {
text: gettext('Add'), text: gettext('Add'),
disabled: !diskCap,
menu: new Ext.menu.Menu({ menu: new Ext.menu.Menu({
items: [ items: [
{ {

12
www/manager6/qemu/HardwareView.js
View File

@ -51,6 +51,7 @@ Ext.define('PVE.qemu.HardwareView', {
} }
var caps = Ext.state.Manager.get('GuiCap'); var caps = Ext.state.Manager.get('GuiCap');
var diskCap = caps.vms['VM.Config.Disk'];
/*jslint confusion: true */ /*jslint confusion: true */
var rows = { var rows = {
@ -325,6 +326,9 @@ Ext.define('PVE.qemu.HardwareView', {
var editor = rowdef.editor; var editor = rowdef.editor;
if (rowdef.tdCls == 'pve-itype-icon-storage') { if (rowdef.tdCls == 'pve-itype-icon-storage') {
if (!diskCap) {
return;
}
var value = me.getObjectValue(rec.data.key, '', true); var value = me.getObjectValue(rec.data.key, '', true);
if (value.match(/vm-.*-cloudinit/)) { if (value.match(/vm-.*-cloudinit/)) {
return; return;
@ -581,15 +585,15 @@ Ext.define('PVE.qemu.HardwareView', {
var isEfi = (key === 'efidisk0'); var isEfi = (key === 'efidisk0');
remove_btn.setDisabled(rec.data['delete'] || (rowdef.never_delete === true)); remove_btn.setDisabled(rec.data['delete'] || (rowdef.never_delete === true) || (isUnusedDisk && !diskCap));
remove_btn.setText((isUsedDisk && !isCloudInit) ? remove_btn.altText : remove_btn.defaultText); remove_btn.setText((isUsedDisk && !isCloudInit) ? remove_btn.altText : remove_btn.defaultText);
remove_btn.RESTMethod = isUnusedDisk ? 'POST':'PUT'; remove_btn.RESTMethod = isUnusedDisk ? 'POST':'PUT';
edit_btn.setDisabled(rec.data['delete'] || !rowdef.editor || isCloudInit); edit_btn.setDisabled(rec.data['delete'] || !rowdef.editor || isCloudInit || !diskCap);
resize_btn.setDisabled(pending || !isUsedDisk); resize_btn.setDisabled(pending || !isUsedDisk || !diskCap);
move_btn.setDisabled(pending || !isUsedDisk); move_btn.setDisabled(pending || !isUsedDisk || !diskCap);
revert_btn.setDisabled(!pending); revert_btn.setDisabled(!pending);