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

Lync Module fixes

Browse source
This commit is contained in:
dev_amdtel 2013-12-16 23:42:11 +04:00
parent bc5591a06d
commit 6936594f9c
2 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncAllocatePhoneNumbers.ascx
View file

@ -31,7 +31,7 @@
<div class="FormBody"> <div class="FormBody">
<wsp:AllocatePackagePhoneNumbers id="allocatePhoneNumbers" runat="server" <wsp:AllocatePackagePhoneNumbers id="allocatePhoneNumbers" runat="server"
Pool="PhoneNumbers" Pool="PhoneNumbers"
ResourceGroup="Web" ResourceGroup="Lync"
ListAddressesControl="lync_phonenumbers" /> ListAddressesControl="lync_phonenumbers" />
</div> </div>
</div> </div>

9
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/UserControls/AllocatePackagePhoneNumbers.ascx.cs
View file

@ -70,22 +70,15 @@ namespace WebsitePanel.Portal.UserControls
private void BindIPAddresses() private void BindIPAddresses()
{ {
bool vps = (Pool == IPAddressPool.VpsExternalNetwork || Pool == IPAddressPool.VpsManagementNetwork);
// bind list // bind list
IPAddressInfo[] ips = ES.Services.Servers.GetUnallottedIPAddresses(PanelSecurity.PackageId, ResourceGroup, Pool); IPAddressInfo[] ips = ES.Services.Servers.GetUnallottedIPAddresses(PanelSecurity.PackageId, ResourceGroup, Pool);
foreach (IPAddressInfo ip in ips) foreach (IPAddressInfo ip in ips)
{ {
string txt = ip.ExternalIP; string txt = ip.ExternalIP;
// web sites - NAT Address if (!String.IsNullOrEmpty(ip.InternalIP))
if (!vps && !String.IsNullOrEmpty(ip.InternalIP))
txt += "/" + ip.InternalIP; txt += "/" + ip.InternalIP;
// VPS - Gateway Address
else if (vps && !String.IsNullOrEmpty(ip.DefaultGateway))
txt += "/" + ip.DefaultGateway;
listExternalAddresses.Items.Add(new ListItem(txt, ip.AddressId.ToString())); listExternalAddresses.Items.Add(new ListItem(txt, ip.AddressId.ToString()));
} }