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

fixed bugs

Browse source
This commit is contained in:
vfedosevich 2013-11-11 17:48:18 +03:00
parent ff9e257362
commit 2af6f848bb
12 changed files with 554 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

6
WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
View file

@ -5110,9 +5110,6 @@
<data name="Quota.Exchange2007.RecoverableItemsSpace" xml:space="preserve">
<value>Recoverable Items Storage, MB</value>
</data>
<data name="ResourceGroup.Exchange" xml:space="preserve">
<value>Hosted Exchange</value>
</data>
<data name="EnterpriseStorage.DiskStorageSpace" xml:space="preserve">
<value>Disk Storage Space, MB</value>
</data>
@ -5359,4 +5356,7 @@
<data name="Success.ORGANIZATION_UPDATE_SECURITY_GROUP_SETTINGS" xml:space="preserve">
<value>Group general settings have been successfully updated.</value>
</data>
<data name="Warning.WEB_SITE_IS_NOT_CREATED" xml:space="preserve">
<value>Website is not created</value>
</data>
</root>

17
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageCreateFolder.ascx.cs
View file

@ -35,6 +35,18 @@ namespace WebsitePanel.Portal.ExchangeServer
{
public partial class EnterpriseStorageCreateFolder : WebsitePanelModuleBase
{
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
if (!ES.Services.EnterpriseStorage.CheckUsersDomainExists(PanelRequest.ItemID))
{
Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "enterprisestorage_folders",
"ItemID=" + PanelRequest.ItemID));
}
}
}
protected void btnCreate_Click(object sender, EventArgs e)
{
@ -42,6 +54,11 @@ namespace WebsitePanel.Portal.ExchangeServer
return;
try
{
if (!ES.Services.EnterpriseStorage.CheckEnterpriseStorageInitialization(PanelSecurity.PackageId, PanelRequest.ItemID))
{
ES.Services.EnterpriseStorage.CreateEnterpriseStorage(PanelSecurity.PackageId, PanelRequest.ItemID);
}
ResultObject result = ES.Services.EnterpriseStorage.CreateEnterpriseFolder(PanelRequest.ItemID, txtFolderName.Text);
if (!result.IsSuccess && result.ErrorCodes.Count > 0)

14
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderGeneralSettings.ascx.cs
View file

@ -49,6 +49,12 @@ namespace WebsitePanel.Portal.ExchangeServer
{
if (!IsPostBack)
{
if (!ES.Services.EnterpriseStorage.CheckUsersDomainExists(PanelRequest.ItemID))
{
Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "enterprisestorage_folders",
"ItemID=" + PanelRequest.ItemID));
}
BindSettings();
}
}
@ -94,8 +100,12 @@ namespace WebsitePanel.Portal.ExchangeServer
litFolderName.Text = txtFolderName.Text;
// SystemFile folder = ES.Services.EnterpriseStorage.GetEnterpriseFolder(PanelRequest.ItemID, PanelRequest.FolderID);
SystemFile folder = new SystemFile();
SystemFile folder = null;
if (!ES.Services.EnterpriseStorage.CheckEnterpriseStorageInitialization(PanelSecurity.PackageId, PanelRequest.ItemID))
{
ES.Services.EnterpriseStorage.CreateEnterpriseStorage(PanelSecurity.PackageId, PanelRequest.ItemID);
}
if (PanelRequest.FolderID != txtFolderName.Text)
{

11
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolders.ascx.cs
View file

@ -41,7 +41,16 @@ namespace WebsitePanel.Portal.ExchangeServer
{
if (!IsPostBack)
{
BindEnterpriseStorageStats();
if (ES.Services.EnterpriseStorage.CheckUsersDomainExists(PanelRequest.ItemID))
{
BindEnterpriseStorageStats();
}
else
{
btnAddFolder.Enabled = false;
messageBox.ShowWarningMessage("WEB_SITE_IS_NOT_CREATED");
}
}
}