From cfe3210b5841e156351ac4479ba00848ab36705f Mon Sep 17 00:00:00 2001 From: doctogonzo Date: Tue, 19 May 2015 12:00:07 +0200 Subject: [PATCH] =?UTF-8?q?quick=20search:=20Exchange=20account=20lead=20t?= =?UTF-8?q?o=20the=20=E2=80=9CMailbox=E2=80=9D=20page?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebsitePanel/Database/update_db.sql | 2 +- .../WebsitePanel/SkinControls/GlobalSearch.ascx.cs | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql index 8ae8e21f..75789ace 100644 --- a/WebsitePanel/Database/update_db.sql +++ b/WebsitePanel/Database/update_db.sql @@ -12340,7 +12340,7 @@ SET @sqlSpace = @sqlSpace + 'SI.ItemID EA.ItemID AS ItemID, EA.AccountName as TextSearch, ''ExchangeAccount'' as ColumnType, - ''ExchangeAccount'' as FullType, + ''ExchangeAccountMailbox'' as FullType, SI2.PackageID as PackageID, EA.AccountID as AccountID FROM @ItemsService AS I2 diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/GlobalSearch.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/GlobalSearch.ascx.cs index eede402a..cac11755 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/GlobalSearch.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/GlobalSearch.ascx.cs @@ -48,6 +48,7 @@ namespace WebsitePanel.Portal.SkinControls const string TYPE_DOMAIN = "Domain"; const string TYPE_ORGANIZATION = "Organization"; const string TYPE_EXCHANGEACCOUNT = "ExchangeAccount"; + const string TYPE_EXCHANGEACCOUNT_MAILBOX = "ExchangeAccountMailbox"; const string PID_SPACE_WEBSITES = "SpaceWebSites"; const string PID_SPACE_DIMAINS = "SpaceDomains"; const string PID_SPACE_EXCHANGESERVER = "SpaceExchangeServer"; @@ -155,6 +156,12 @@ namespace WebsitePanel.Portal.SkinControls "AccountID="+this.tbAccountId.Text,"Context=User", "moduleDefId=ExchangeServer"); break; + case TYPE_EXCHANGEACCOUNT_MAILBOX: + res = PortalUtils.NavigatePageURL(PID_SPACE_EXCHANGESERVER, "ItemID", itemId.ToString(), + PortalUtils.SPACE_ID_PARAM + "=" + spaceId, "ctl=edit_user",//"mid="+this.ModuleID.ToString(), + "AccountID=" + this.tbAccountId.Text, "Context=Mailbox", + "moduleDefId=ExchangeServer"); + break; default: res = PortalUtils.GetSpaceHomePageUrl(itemId); break;