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

Existing Lync 2013 renamed to Enterprise

Browse source 
Lync 2013 HP provider implmentement
Portal issue fixed when no phone numbers are allocated
This commit is contained in:
robvde 2013-10-20 15:29:39 +04:00
parent 9247943323
commit 0aa18dc88a
14 changed files with 1703 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageSpaces.ascx.cs
View file

@ -101,7 +101,7 @@ namespace WebsitePanel.Portal.ExchangeServer
}
// rebind domains
BindDomainNames();
//BindDomainNames();
BindStats();
}
@ -132,7 +132,7 @@ namespace WebsitePanel.Portal.ExchangeServer
}
// rebind domains
BindDomainNames();
//BindDomainNames();
BindStats();
}
@ -155,12 +155,12 @@ namespace WebsitePanel.Portal.ExchangeServer
{
messageBox.ShowResultMessage(result);
if (BusinessErrorCodes.ERROR_USER_ACCOUNT_DEMO == result)
BindDomainNames();
//BindDomainNames();
return;
}
// rebind domains
BindDomainNames();
//BindDomainNames();
}
catch (Exception ex)
{

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncCreateUser.ascx.cs
View file

@ -122,7 +122,7 @@ namespace WebsitePanel.Portal.Lync
bool enterpriseVoiceQuota = Utils.CheckQouta(Quotas.LYNC_ENTERPRISEVOICE, cntx);
string lineUri = "";
if (enterpriseVoiceQuota) lineUri = ddlPhoneNumber.SelectedItem.Text + ":" + tbPin.Text;
if ((enterpriseVoiceQuota) & (ddlPhoneNumber.Items.Count != 0)) lineUri = ddlPhoneNumber.SelectedItem.Text + ":" + tbPin.Text;
//#1
LyncUser lyncUser = ES.Services.Lync.GetLyncUserGeneralSettings(PanelRequest.ItemID, accountId);

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncEditUser.ascx.cs
View file

@ -130,7 +130,7 @@ namespace WebsitePanel.Portal.Lync
bool enterpriseVoiceQuota = Utils.CheckQouta(Quotas.LYNC_ENTERPRISEVOICE, cntx);
string lineUri = "";
if (enterpriseVoiceQuota) lineUri = ddlPhoneNumber.SelectedItem.Text + ":" + tbPin.Text;
if ((enterpriseVoiceQuota) & (ddlPhoneNumber.Items.Count != 0)) lineUri = ddlPhoneNumber.SelectedItem.Text + ":" + tbPin.Text;
LyncUserResult res = ES.Services.Lync.SetUserLyncPlan(PanelRequest.ItemID, PanelRequest.AccountID, Convert.ToInt32(planSelector.planId));
if (res.IsSuccess && res.ErrorCodes.Count == 0)

12
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj
View file

@ -524,6 +524,13 @@
<Compile Include="UserControls\OrgIdPolicyEditor.ascx.designer.cs">
<DependentUpon>OrgIdPolicyEditor.ascx</DependentUpon>
</Compile>
<Compile Include="UserControls\OrgPolicyEditor.ascx.cs">
<DependentUpon>OrgPolicyEditor.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="UserControls\OrgPolicyEditor.ascx.designer.cs">
<DependentUpon>OrgPolicyEditor.ascx</DependentUpon>
</Compile>
<Compile Include="UserControls\PackagePhoneNumbers.ascx.cs">
<DependentUpon>PackagePhoneNumbers.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@ -4039,6 +4046,7 @@
<Content Include="SettingsLyncUserPlansPolicy.ascx" />
<Content Include="UserControls\EditFeedsList.ascx" />
<Content Include="UserControls\OrgIdPolicyEditor.ascx" />
<Content Include="UserControls\OrgPolicyEditor.ascx" />
<Content Include="UserControls\PackagePhoneNumbers.ascx" />
<Content Include="UserControls\AllocatePackagePhoneNumbers.ascx" />
<Content Include="VPSForPC\MonitoringPage.aspx" />
@ -5225,8 +5233,8 @@
<SubType>Designer</SubType>
</Content>
<Content Include="ProviderControls\App_LocalResources\EnterpriseStorage_Settings.ascx.resx" />
<Content Include="ExchangeServer\App_LocalResources\EnterpriseStorageSpaces.ascx.resx">
<Content Include="UserControls\App_LocalResources\OrgPolicyEditor.ascx.resx" />
<Content Include="ExchangeServer\App_LocalResources\EnterpriseStorageSpaces.ascx.resx" />
<Content Include="UserControls\App_LocalResources\OrgPolicyEditor.ascx.resx">
<SubType>Designer</SubType>
</Content>
<EmbeddedResource Include="UserControls\App_LocalResources\EditDomainsList.ascx.resx">