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

Fixed: SpaceQuotaOverview, unallocated quotas where shown, OCS and exchange

Browse source 
missing

Fixed UserCustomers initial sort order on username
This commit is contained in:
robvde 2012-09-04 07:31:50 +04:00
parent 7483dd857f
commit 1e6a707edb
7 changed files with 88 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
WebsitePanel/Database/install_db.sql
View file

@ -26213,6 +26213,12 @@ AS
INNER JOIN ServiceItems si ON ea.ItemID = si.ItemID
INNER JOIN PackagesTreeCache pt ON si.PackageID = pt.PackageID
WHERE pt.ParentPackageID = @PackageID)
ELSE IF @QuotaID = 320 -- OCS Users
SET @Result = (SELECT COUNT(ea.AccountID) FROM ExchangeAccounts ea
INNER JOIN OCSUsers ocs ON ea.AccountID = ocs.AccountID
INNER JOIN ServiceItems si ON ea.ItemID = si.ItemID
INNER JOIN PackagesTreeCache pt ON si.PackageID = pt.PackageID
WHERE pt.ParentPackageID = @PackageID)
ELSE IF @QuotaID = 206 -- HostedSolution.Users
SET @Result = (SELECT COUNT(ea.AccountID) FROM ExchangeAccounts AS ea
INNER JOIN ServiceItems si ON ea.ItemID = si.ItemID

6
WebsitePanel/Database/update_db.sql
View file

@ -1765,6 +1765,12 @@ AS
INNER JOIN ServiceItems si ON ea.ItemID = si.ItemID
INNER JOIN PackagesTreeCache pt ON si.PackageID = pt.PackageID
WHERE pt.ParentPackageID = @PackageID)
ELSE IF @QuotaID = 320 -- OCS Users
SET @Result = (SELECT COUNT(ea.AccountID) FROM ExchangeAccounts ea
INNER JOIN OCSUsers ocs ON ea.AccountID = ocs.AccountID
INNER JOIN ServiceItems si ON ea.ItemID = si.ItemID
INNER JOIN PackagesTreeCache pt ON si.PackageID = pt.PackageID
WHERE pt.ParentPackageID = @PackageID)
ELSE IF @QuotaID = 206 -- HostedSolution.Users
SET @Result = (SELECT COUNT(ea.AccountID) FROM ExchangeAccounts AS ea
INNER JOIN ServiceItems si ON ea.ItemID = si.ItemID

6
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SpaceQuotas.ascx.resx
View file

@ -189,4 +189,10 @@
<data name="lblLyncUsers.Text" xml:space="preserve">
<value>Lync Users:</value>
</data>
<data name="lblExchangeAccounts.Text" xml:space="preserve">
<value>Exchange Mailboxes:</value>
</data>
<data name="lblExchangeStorage.Text" xml:space="preserve">
<value>Exchange Storage, MB:</value>
</data>
</root>

8
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx
View file

@ -30,6 +30,14 @@
<td class="SubHead" nowrap><asp:Label ID="lblUserAccounts" runat="server" meta:resourcekey="lblUserAccounts" Text="User Accounts:"></asp:Label></td>
<td class="Normal"><wsp:Quota ID="quotaUserAccounts" runat="server" QuotaName="HostedSolution.Users" DisplayGauge="True" /></td>
</tr>
<tr ID="pnlExchangeAccounts" runat="server">
<td class="SubHead" nowrap><asp:Label ID="lblExchangeAccounts" runat="server" meta:resourcekey="lblExchangeAccounts" Text="Exchange Accounts:"></asp:Label></td>
<td class="Normal"><wsp:Quota ID="quotaExchangeAccounts" runat="server" QuotaName="Exchange2007.Mailboxes" DisplayGauge="True" /></td>
</tr>
<tr ID="pnlExchangeStorage" runat="server">
<td class="SubHead" nowrap><asp:Label ID="lblExchangeStorage" runat="server" meta:resourcekey="lblExchangeStorage" Text="Exchange Storage:"></asp:Label></td>
<td class="Normal"><wsp:Quota ID="quotaExchangeStorage" runat="server" QuotaName="Exchange2007.DiskSpace" DisplayGauge="True" /></td>
</tr>
<tr ID="pnlMailAccounts" runat="server">
<td class="SubHead" nowrap><asp:Label ID="lblMailAccounts" runat="server" meta:resourcekey="lblMailAccounts" Text="Mail Accounts:"></asp:Label></td>
<td class="Normal"><wsp:Quota ID="quotaMailAccounts" runat="server" QuotaName="Mail.Accounts" DisplayGauge="True" /></td>

7
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx.cs
View file

@ -59,14 +59,17 @@ namespace WebsitePanel.Portal
{ "quotaSubDomains", "pnlSubDomains" },
{ "quotaDomainPointers", "pnlDomainPointers" },
{ "quotaUserAccounts", "pnlUserAccounts" },
{ "quotaMailAccounts", "pnlMailboxes" },
{ "quotaMailAccounts", "pnlMailAccounts" },
{ "quotaExchangeAccounts", "pnlExchangeAccounts" },
{ "quotaOCSUsers", "pnlOCSUsers" },
{ "quotaLyncUsers", "pnlLyncUsers" },
{ "quotaBlackBerryUsers", "pnlBlackBerryUsers" },
{ "quotaSharepointSites", "pnlSharepointSites" },
{ "quotaWebSites", "pnlWebSites" },
{ "quotaDatabases", "pnlDatabases" },
{ "quotaNumberOfVm", "pnlHyperVForPC" }
{ "quotaNumberOfVm", "pnlHyperVForPC" },
{ "quotaFtpAccounts", "pnlFtpAccounts" },
{ "quotaExchangeStorage", "pnlExchangeStorage" }
};
protected void Page_Load(object sender, EventArgs e)

54
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx.designer.cs generated
View file

@ -174,6 +174,60 @@ namespace WebsitePanel.Portal {
/// </remarks>
protected global::WebsitePanel.Portal.Quota quotaUserAccounts;
/// <summary>
/// pnlExchangeAccounts control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTableRow pnlExchangeAccounts;
/// <summary>
/// lblExchangeAccounts control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblExchangeAccounts;
/// <summary>
/// quotaExchangeAccounts control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::WebsitePanel.Portal.Quota quotaExchangeAccounts;
/// <summary>
/// pnlExchangeStorage control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTableRow pnlExchangeStorage;
/// <summary>
/// lblExchangeStorage control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblExchangeStorage;
/// <summary>
/// quotaExchangeStorage control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::WebsitePanel.Portal.Quota quotaExchangeStorage;
/// <summary>
/// pnlMailAccounts control.
/// </summary>

3
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserCustomers.ascx.cs
View file

@ -64,6 +64,9 @@ namespace WebsitePanel.Portal
Utils.SelectListItem(ddlStatus, Request["StatusID"]);
if (Request["RoleID"] != null)
Utils.SelectListItem(ddlRole, Request["RoleID"]);
gvUsers.Sort("Username", System.Web.UI.WebControls.SortDirection.Ascending);
}
}