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

fix for hosted organization users list and mailbox list. fixed checking quotas for ServiceLevel

Browse source
This commit is contained in:
dev_amdtel 2015-02-16 20:32:12 +04:00
parent abf88685dc
commit 8e376117a0
1 changed files with 54 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

73
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/UserActions.ascx.cs
View file

@ -90,7 +90,7 @@ namespace WebsitePanel.Portal
case UserActionTypes.Enable: case UserActionTypes.Enable:
return ChangeUsersSettings(userIds, false, null, null); return ChangeUsersSettings(userIds, false, null, null);
case UserActionTypes.SetServiceLevel: case UserActionTypes.SetServiceLevel:
return ChangeUsersSettings(userIds, null, SelectedServiceId, null); return ChangeUsersServiceLevel(userIds);
case UserActionTypes.SetVIP: case UserActionTypes.SetVIP:
return ChangeUsersSettings(userIds, null, null, true); return ChangeUsersSettings(userIds, null, null, true);
case UserActionTypes.UnsetVIP: case UserActionTypes.UnsetVIP:
@ -102,6 +102,42 @@ namespace WebsitePanel.Portal
return 0; return 0;
} }
protected int ChangeUsersServiceLevel(List<int> userIds)
{
if (ddlServiceLevels.SelectedItem == null)
return 0;
string levelName = ddlServiceLevels.SelectedItem.Text;
if (string.IsNullOrEmpty(levelName))
return 0;
int levelId;
if (!int.TryParse(ddlServiceLevels.SelectedItem.Value, out levelId))
return 0;
string quotaName = Quotas.SERVICE_LEVELS + levelName;
PackageContext cntx = PackagesHelper.GetCachedPackageContext(PanelSecurity.PackageId);
if (!cntx.Quotas.ContainsKey(quotaName))
return 0;
List<OrganizationUser> users = new List<OrganizationUser>();
foreach (int id in userIds)
users.Add(ES.Services.Organizations.GetUserGeneralSettings(PanelRequest.ItemID, id));
int usersCount = users.Count - users.Where(x => (x.LevelId == levelId)).Count();
if (!CheckServiceLevelQuota(cntx.Quotas[quotaName], usersCount))
return -1;
return ChangeUsersSettings(userIds, null, levelId, null);
}
protected void btnModalOk_Click(object sender, EventArgs e) protected void btnModalOk_Click(object sender, EventArgs e)
{ {
FireExecuteAction(); FireExecuteAction();
@ -165,8 +201,6 @@ namespace WebsitePanel.Portal
} }
#region ServiceLevel
protected int SetMailboxPlan(List<int> userIds) protected int SetMailboxPlan(List<int> userIds)
{ {
int planId; int planId;
@ -190,19 +224,20 @@ namespace WebsitePanel.Portal
return 0; return 0;
} }
protected int? SelectedServiceId #region ServiceLevel
{
get
{
if (ddlServiceLevels.SelectedValue == string.Empty)
return null;
return Convert.ToInt32(ddlServiceLevels.SelectedValue);
}
}
protected void FillServiceLevelsList() protected void FillServiceLevelsList()
{ {
if (GridView == null || String.IsNullOrWhiteSpace(CheckboxesName))
return;
List<int> ids = Utils.GetCheckboxValuesFromGrid<int>(GridView, CheckboxesName);
List<OrganizationUser> users = new List<OrganizationUser>();
foreach(int id in ids)
users.Add(ES.Services.Organizations.GetUserGeneralSettings(PanelRequest.ItemID, id));
PackageContext cntx = PackagesHelper.GetCachedPackageContext(PanelSecurity.PackageId); PackageContext cntx = PackagesHelper.GetCachedPackageContext(PanelSecurity.PackageId);
if (cntx.Groups.ContainsKey(ResourceGroups.ServiceLevels)) if (cntx.Groups.ContainsKey(ResourceGroups.ServiceLevels))
@ -211,12 +246,12 @@ namespace WebsitePanel.Portal
foreach (var quota in cntx.Quotas.Where(x => x.Key.Contains(Quotas.SERVICE_LEVELS))) foreach (var quota in cntx.Quotas.Where(x => x.Key.Contains(Quotas.SERVICE_LEVELS)))
{ {
foreach (var serviceLevel in ES.Services.Organizations.GetSupportServiceLevels()) foreach (ServiceLevel serviceLevel in ES.Services.Organizations.GetSupportServiceLevels())
{ {
if (quota.Key.Replace(Quotas.SERVICE_LEVELS, "") == serviceLevel.LevelName && CheckServiceLevelQuota(quota.Value)) int usersCount = users.Count - users.Where(x => (x.LevelId == serviceLevel.LevelId)).Count();
{
if (quota.Key.Replace(Quotas.SERVICE_LEVELS, "") == serviceLevel.LevelName && CheckServiceLevelQuota(quota.Value, usersCount))
enabledServiceLevels.Add(serviceLevel); enabledServiceLevels.Add(serviceLevel);
}
} }
} }
@ -230,11 +265,11 @@ namespace WebsitePanel.Portal
} }
} }
private bool CheckServiceLevelQuota(QuotaValueInfo quota) private bool CheckServiceLevelQuota(QuotaValueInfo quota, int itemCount)
{ {
if (quota.QuotaAllocatedValue != -1) if (quota.QuotaAllocatedValue != -1)
{ {
return quota.QuotaAllocatedValue > quota.QuotaUsedValue; return quota.QuotaAllocatedValue >= quota.QuotaUsedValue + itemCount;
} }
return true; return true;