Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-25 06:16:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #596 from GaborApatiNagy/master_CA-177058

Browse Source 
CA-177058: [SCTX-2146] VM Power Admin could not create VMs - RBAC issues with XS 6.5
This commit is contained in:
Stephen Turner 2015-08-05 12:21:27 +01:00
commit cdfc665458
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
XenAdmin/Wizards/NewVMWizard/NewVMWizard.cs
View File

@ -180,6 +180,7 @@ namespace XenAdmin.Wizards.NewVMWizard
VMOperationCommand.StartDiagnosisForm, VMOperationCommand.StartDiagnosisForm,
gpuCapability ? pageVgpu.GpuGroup : null, gpuCapability ? pageVgpu.GpuGroup : null,
gpuCapability ? pageVgpu.VgpuType : null, gpuCapability ? pageVgpu.VgpuType : null,
pageVgpu.HasChanged,
page_5_CpuMem.SelectedCoresPerSocket, page_5_CpuMem.SelectedCoresPerSocket,
page_CloudConfigParameters.ConfigDriveTemplateText); page_CloudConfigParameters.ConfigDriveTemplateText);

5
XenModel/Actions/VM/CreateVMAction.cs
View File

@ -117,7 +117,7 @@ namespace XenAdmin.Actions.VMActions
List<DiskDescription> disks, SR fullCopySR, List<VIF> vifs, bool startAfter, List<DiskDescription> disks, SR fullCopySR, List<VIF> vifs, bool startAfter,
Action<VM, bool> warningDialogHAInvalidConfig, Action<VM, bool> warningDialogHAInvalidConfig,
Action<VMStartAbstractAction, Failure> startDiagnosisForm, Action<VMStartAbstractAction, Failure> startDiagnosisForm,
GPU_group gpuGroup, VGPU_type vgpuType, long coresPerSocket, string cloudConfigDriveTemplateText) GPU_group gpuGroup, VGPU_type vgpuType, bool modifyVgpuSettings, long coresPerSocket, string cloudConfigDriveTemplateText)
: base(connection, string.Format(Messages.CREATE_VM, name), : base(connection, string.Format(Messages.CREATE_VM, name),
string.Format(Messages.CREATE_VM_FROM_TEMPLATE, name, Helpers.GetName(template))) string.Format(Messages.CREATE_VM_FROM_TEMPLATE, name, Helpers.GetName(template)))
{ {
@ -149,8 +149,7 @@ namespace XenAdmin.Actions.VMActions
if (HomeServer != null || pool_of_one != null) // otherwise we have no where to put the action if (HomeServer != null || pool_of_one != null) // otherwise we have no where to put the action
AppliesTo.Add(HomeServer != null ? HomeServer.opaque_ref : pool_of_one.opaque_ref); AppliesTo.Add(HomeServer != null ? HomeServer.opaque_ref : pool_of_one.opaque_ref);
assignOrRemoveVgpu = (GpuGroup != null && VgpuType != null) assignOrRemoveVgpu = GpuGroup != null && VgpuType != null || modifyVgpuSettings && Helpers.GpuCapability(Connection);
|| Helpers.GpuCapability(Connection);
#region RBAC Dependencies #region RBAC Dependencies