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

fixed wsp-10195 Exchange 2013 - User display names with the | char

Browse source
This commit is contained in:
robvde 2013-10-28 23:08:02 +04:00
parent ccc2e6bac7
commit da29620908
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/MailboxSelector.ascx
View file

@ -57,7 +57,7 @@
<ItemTemplate> <ItemTemplate>
<asp:Image ID="img1" runat="server" ImageUrl='<%# GetAccountImage((int)Eval("AccountType")) %>' ImageAlign="AbsMiddle" /> <asp:Image ID="img1" runat="server" ImageUrl='<%# GetAccountImage((int)Eval("AccountType")) %>' ImageAlign="AbsMiddle" />
<asp:LinkButton ID="cmdSelectAccount" CommandName="SelectAccount" <asp:LinkButton ID="cmdSelectAccount" CommandName="SelectAccount"
CommandArgument='<%# Eval("AccountName").ToString() + "|" + Eval("DisplayName").ToString()+ "|" + Eval("PrimaryEmailAddress")+ "|" + Eval("AccountId")%>' CommandArgument='<%# Eval("AccountName").ToString() + "^" + Eval("DisplayName").ToString()+ "^" + Eval("PrimaryEmailAddress")+ "^" + Eval("AccountId")%>'
runat="server" Text='<%# Eval("DisplayName") %>'></asp:LinkButton> runat="server" Text='<%# Eval("DisplayName") %>'></asp:LinkButton>
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>

4
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/MailboxSelector.ascx.cs
View file

@ -31,6 +31,7 @@ using System.Collections.Generic;
using System.Web.UI; using System.Web.UI;
using System.Web.UI.WebControls; using System.Web.UI.WebControls;
using WebsitePanel.Providers.HostedSolution; using WebsitePanel.Providers.HostedSolution;
using System.Text.RegularExpressions;
namespace WebsitePanel.Portal.ExchangeServer.UserControls namespace WebsitePanel.Portal.ExchangeServer.UserControls
{ {
@ -218,7 +219,8 @@ namespace WebsitePanel.Portal.ExchangeServer.UserControls
{ {
if (e.CommandName == "SelectAccount") if (e.CommandName == "SelectAccount")
{ {
string[] parts = e.CommandArgument.ToString().Split('|');
string[] parts = e.CommandArgument.ToString().Split('^');
ExchangeAccount account = new ExchangeAccount(); ExchangeAccount account = new ExchangeAccount();
account.AccountName = parts[0]; account.AccountName = parts[0];
account.DisplayName = parts[1]; account.DisplayName = parts[1];