fixing bugs
This commit is contained in:
vfedosevich
parent
54fade88c8
commit
dbb90a0f6b
7 changed files with 43 additions and 12 deletions
|
|
@ -228,7 +228,7 @@ namespace WebsitePanel.Providers.EnterpriseStorage
|
|||
|
||||
SecurityUtils.ResetNtfsPermissions(path);
|
||||
|
||||
SecurityUtils.GrantGroupNtfsPermissions(path, users.ToArray(), true, new RemoteServerSettings(), null, null);
|
||||
SecurityUtils.GrantGroupNtfsPermissions(path, users.ToArray(), false, new RemoteServerSettings(), null, null);
|
||||
|
||||
IWebDav webdav = new WebDav(UsersDomain);
|
||||
|
||||
|
|
|
|||
|
|
@ -159,4 +159,7 @@
|
|||
<data name="gvFolderQuota.Header" xml:space="preserve">
|
||||
<value>Allocated Space</value>
|
||||
</data>
|
||||
<data name="locQuotaAvailableSpace.Text" xml:space="preserve">
|
||||
<value>Used Diskspace (Mb):</value>
|
||||
</data>
|
||||
</root>
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
<asp:TextBox ID="txtFolderSize" runat="server" CssClass="HugeTextBox200"></asp:TextBox>
|
||||
<asp:RequiredFieldValidator ID="valRequireFolderSize" runat="server" meta:resourcekey="valRequireFolderSize" ControlToValidate="txtFolderSize"
|
||||
ErrorMessage="Enter Folder Size" ValidationGroup="EditFolder" Display="Dynamic" Text="*" SetFocusOnError="True"></asp:RequiredFieldValidator>
|
||||
<asp:RangeValidator ID="rangeFolderSize" runat="server" ControlToValidate="txtFolderSize" MaximumValue="99999999" MinimumValue="1" Type="Integer"
|
||||
<asp:RangeValidator ID="rangeFolderSize" runat="server" ControlToValidate="txtFolderSize" MaximumValue="99999999" MinimumValue="0.01" Type="Double"
|
||||
ValidationGroup="EditFolder" Display="Dynamic" Text="*" SetFocusOnError="True"
|
||||
ErrorMessage="The quota you’ve entered exceeds the available quota for tenant" />
|
||||
</td>
|
||||
|
|
|
|||
|
|
@ -69,7 +69,8 @@ namespace WebsitePanel.Portal.ExchangeServer
|
|||
{
|
||||
OrganizationStatistics tenantStats = ES.Services.Organizations.GetOrganizationStatistics(PanelRequest.ItemID);
|
||||
|
||||
rangeFolderSize.MaximumValue = ((tenantStats.AllocatedEnterpriseStorageSpace - tenantStats.UsedEnterpriseStorageSpace)/OneGb + Utils.ParseInt(txtFolderSize.Text, 0)).ToString();
|
||||
rangeFolderSize.MaximumValue = Math.Round((tenantStats.AllocatedEnterpriseStorageSpace - (decimal)tenantStats.UsedEnterpriseStorageSpace)/OneGb
|
||||
+ Utils.ParseDecimal(txtFolderSize.Text, 0), 2).ToString();
|
||||
rangeFolderSize.ErrorMessage = string.Format("The quota you’ve entered exceeds the available quota for tenant ({0}Gb)", rangeFolderSize.MaximumValue);
|
||||
}
|
||||
}
|
||||
|
|
@ -91,9 +92,9 @@ namespace WebsitePanel.Portal.ExchangeServer
|
|||
txtFolderName.Text = folder.Name;
|
||||
lblFolderUrl.Text = folder.Url;
|
||||
|
||||
if (folder.FRSMQuotaGB != -1)
|
||||
if (folder.FRSMQuotaMB != -1)
|
||||
{
|
||||
txtFolderSize.Text = folder.FRSMQuotaGB.ToString();
|
||||
txtFolderSize.Text = (Math.Round((decimal)folder.FRSMQuotaMB / OneGb, 2)).ToString();
|
||||
}
|
||||
|
||||
switch (folder.FsrmQuotaType)
|
||||
|
|
@ -163,7 +164,7 @@ namespace WebsitePanel.Portal.ExchangeServer
|
|||
folder,
|
||||
permissions.GetPemissions(),
|
||||
chkDirectoryBrowsing.Checked,
|
||||
int.Parse(txtFolderSize.Text) * OneGb,
|
||||
(int)(decimal.Parse(txtFolderSize.Text) * OneGb),
|
||||
rbtnQuotaSoft.Checked ? QuotaType.Soft : QuotaType.Hard);
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -63,13 +63,13 @@
|
|||
<asp:TemplateField HeaderText="gvFolderQuota" SortExpression="FRSMQuotaGB">
|
||||
<ItemStyle Width="20%"></ItemStyle>
|
||||
<ItemTemplate>
|
||||
<asp:Literal id="litFolderQuota" runat="server" Text='<%# Eval("FRSMQuotaGB").ToString() + " Gb" %>'></asp:Literal>
|
||||
<asp:Literal id="litFolderQuota" runat="server" Text='<%# ConvertMBytesToGB(Eval("FRSMQuotaMB")).ToString() + " Gb" %>'></asp:Literal>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:TemplateField HeaderText="gvFolderSize" SortExpression="Size">
|
||||
<ItemStyle Width="20%"></ItemStyle>
|
||||
<ItemTemplate>
|
||||
<asp:Literal id="litFolderSize" runat="server" Text='<%# (ConvertMBytesToGB(Eval("Size"))).ToString("f1") + " Gb" %>'></asp:Literal>
|
||||
<asp:Literal id="litFolderSize" runat="server" Text='<%# (ConvertMBytesToGB(Eval("Size"))).ToString() + " Gb" %>'></asp:Literal>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:TemplateField HeaderText="gvFolderUrl">
|
||||
|
|
@ -108,6 +108,12 @@
|
|||
<asp:Localize ID="locQuotaSpace" runat="server" meta:resourcekey="locQuotaSpace" Text="Total Space Allocated (Gb):"></asp:Localize>
|
||||
|
||||
<wsp:QuotaViewer ID="spaceQuota" runat="server" QuotaTypeId="3" />
|
||||
<br />
|
||||
<br />
|
||||
|
||||
<asp:Localize ID="locQuotaAvailableSpace" runat="server" meta:resourcekey="locQuotaAvailableSpace" Text="Used Diskspace (Mb):"></asp:Localize>
|
||||
|
||||
<wsp:QuotaViewer ID="spaceAvailableQuota" runat="server" QuotaTypeId="2" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ namespace WebsitePanel.Portal.ExchangeServer
|
|||
|
||||
public decimal ConvertMBytesToGB(object size)
|
||||
{
|
||||
return Convert.ToDecimal(size) / OneGb;
|
||||
return Math.Round(Convert.ToDecimal(size) / OneGb, 2);
|
||||
}
|
||||
|
||||
protected void BindEnterpriseStorageStats()
|
||||
|
|
@ -82,6 +82,11 @@ namespace WebsitePanel.Portal.ExchangeServer
|
|||
foldersQuota.QuotaUsedValue = organizationStats.CreatedEnterpriseStorageFolders;
|
||||
foldersQuota.QuotaValue = organizationStats.AllocatedEnterpriseStorageFolders;
|
||||
|
||||
spaceAvailableQuota.QuotaUsedValue = organizationStats.UsedEnterpriseStorageSpace;
|
||||
spaceAvailableQuota.QuotaValue = organizationStats.AllocatedEnterpriseStorageSpace;
|
||||
|
||||
spaceQuota.QuotaValue = (int)Math.Round(ConvertMBytesToGB(organizationStats.UsedEnterpriseStorageSpace), 0);
|
||||
|
||||
if (organizationStats.AllocatedEnterpriseStorageFolders != -1)
|
||||
{
|
||||
int folderAvailable = foldersQuota.QuotaAvailable = tenantStats.AllocatedEnterpriseStorageFolders - tenantStats.CreatedEnterpriseStorageFolders;
|
||||
|
|
@ -94,15 +99,13 @@ namespace WebsitePanel.Portal.ExchangeServer
|
|||
|
||||
if (organizationStats.AllocatedEnterpriseStorageSpace != -1)
|
||||
{
|
||||
int spaceAvailable = (int)ConvertMBytesToGB(tenantStats.AllocatedEnterpriseStorageSpace - tenantStats.UsedEnterpriseStorageSpace);
|
||||
int spaceAvailable = spaceAvailableQuota.QuotaAvailable = tenantStats.AllocatedEnterpriseStorageSpace - tenantStats.UsedEnterpriseStorageSpace;
|
||||
|
||||
if (spaceAvailable <= 0)
|
||||
{
|
||||
btnAddFolder.Enabled = false;
|
||||
}
|
||||
}
|
||||
|
||||
spaceQuota.QuotaValue = (int)ConvertMBytesToGB(organizationStats.UsedEnterpriseStorageSpace);
|
||||
}
|
||||
|
||||
protected void btnAddFolder_Click(object sender, EventArgs e)
|
||||
|
|
|
|||
|
|
@ -173,5 +173,23 @@ namespace WebsitePanel.Portal.ExchangeServer {
|
|||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::WebsitePanel.Portal.QuotaViewer spaceQuota;
|
||||
|
||||
/// <summary>
|
||||
/// locQuotaAvailableSpace 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.Localize locQuotaAvailableSpace;
|
||||
|
||||
/// <summary>
|
||||
/// spaceAvailableQuota control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::WebsitePanel.Portal.QuotaViewer spaceAvailableQuota;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue