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

fix bug in SpaceQuotasControl.

Browse source
This commit is contained in:
vfedosevich 2014-09-16 12:37:59 +03:00
parent c15aff08b0
commit 732f827e82
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotasControl.ascx
View file

@ -13,7 +13,7 @@
<ItemTemplate>
<div class="Quota">
<div class="Left">
<%# GetQuotaTitle((string)Eval("QuotaName"), (string)Eval("QuotaDescription"))%>:
<%# GetQuotaTitle((string)Eval("QuotaName"), (object)Eval("QuotaDescription"))%>:
</div>
<div class="Viewer">
<uc1:QuotaViewer ID="quota" runat="server"

8
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotasControl.ascx.cs
View file

@ -76,11 +76,11 @@ namespace WebsitePanel.Portal
return new DataView(dsQuotas.Tables[1], "GroupID=" + groupId.ToString(), "", DataViewRowState.CurrentRows);
}
public string GetQuotaTitle(string quotaName, string quotaDescription)
public string GetQuotaTitle(string quotaName, object quotaDescription)
{
return quotaName.Contains("ServiceLevel") ?
(string.IsNullOrEmpty(quotaDescription) ?
string.Empty : quotaDescription).ToString()
string description = (quotaDescription.GetType() == typeof(System.DBNull)) ? string.Empty : (string)quotaDescription;
return quotaName.Contains("ServiceLevel") ? description
: GetSharedLocalizedString("Quota." + quotaName);
}
}