zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Hyper-V bugfix

Browse source
This commit is contained in:
Alexander Trofimov 2015-05-05 15:59:01 +03:00
parent 1bf6c993c2
commit 9788536ab4
3 changed files with 13 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

20
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/VirtualMachines2012Helper.cs
View file

@ -138,18 +138,18 @@ namespace WebsitePanel.Portal
return r; return r;
} }
public static bool IsReplicationEnabled(int packageId) //public static bool IsReplicationEnabled(int packageId)
{ //{
var vmsMeta = (new VirtualMachines2012Helper()).GetVirtualMachines(packageId, null, null, null, 1, 0); // var vmsMeta = (new VirtualMachines2012Helper()).GetVirtualMachines(packageId, null, null, null, 1, 0);
if (vmsMeta.Length == 0) return false; // if (vmsMeta.Length == 0) return false;
var packageVm = ES.Services.VPS2012.GetVirtualMachineItem(vmsMeta[0].ItemID); // var packageVm = ES.Services.VPS2012.GetVirtualMachineItem(vmsMeta[0].ItemID);
if (packageVm == null) return false; // if (packageVm == null) return false;
var serviceSettings = ConvertArrayToDictionary(ES.Services.Servers.GetServiceSettings(packageVm.ServiceId)); // var serviceSettings = ConvertArrayToDictionary(ES.Services.Servers.GetServiceSettings(packageVm.ServiceId));
if (serviceSettings == null) return false; // if (serviceSettings == null) return false;
return serviceSettings["ReplicaMode"] == ReplicaMode.ReplicationEnabled.ToString(); // return serviceSettings["ReplicaMode"] == ReplicaMode.ReplicationEnabled.ToString();
} //}
} }
} }

7
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/ServerTabs.ascx.cs
View file

@ -133,12 +133,9 @@ namespace WebsitePanel.Portal.VPS2012.UserControls
if ((vm.ExternalNetworkEnabled || vm.PrivateNetworkEnabled) && !createError) if ((vm.ExternalNetworkEnabled || vm.PrivateNetworkEnabled) && !createError)
tabsList.Add(CreateTab("vps_network", "Tab.Network")); tabsList.Add(CreateTab("vps_network", "Tab.Network"));
if (VirtualMachines2012Helper.IsReplicationEnabled(PanelSecurity.PackageId) && !createError) if (PackagesHelper.IsQuotaEnabled(PanelSecurity.PackageId, Quotas.VPS2012_REPLICATION_ENABLED))
{ {
if (PackagesHelper.IsQuotaEnabled(PanelSecurity.PackageId, Quotas.VPS2012_REPLICATION_ENABLED)) tabsList.Add(CreateTab("vps_replication", "Tab.Replication"));
{
tabsList.Add(CreateTab("vps_replication", "Tab.Replication"));
}
} }
//tabsList.Add(CreateTab("vps_permissions", "Tab.Permissions")); //tabsList.Add(CreateTab("vps_permissions", "Tab.Permissions"));

4
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcHome.ascx.cs
View file

@ -52,9 +52,7 @@ namespace WebsitePanel.Portal.VPS2012
gvServers.Columns[4].Visible = !isUserSelected; gvServers.Columns[4].Visible = !isUserSelected;
// replication // replication
gvServers.Columns[5].Visible = gvServers.Columns[5].Visible = PackagesHelper.IsQuotaEnabled(PanelSecurity.PackageId, Quotas.VPS2012_REPLICATION_ENABLED);
PackagesHelper.IsQuotaEnabled(PanelSecurity.PackageId, Quotas.VPS2012_REPLICATION_ENABLED) &&
VirtualMachines2012Helper.IsReplicationEnabled(PanelSecurity.PackageId);
// check package quotas // check package quotas
bool manageAllowed = VirtualMachines2012Helper.IsVirtualMachineManagementAllowed(PanelSecurity.PackageId); bool manageAllowed = VirtualMachines2012Helper.IsVirtualMachineManagementAllowed(PanelSecurity.PackageId);