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

Merge

Browse source
This commit is contained in:
Virtuworks 2015-05-19 07:24:58 -04:00
commit 43bf5020b1
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
WebsitePanel/Database/update_db.sql
View file

@ -12340,7 +12340,7 @@ SET @sqlSpace = @sqlSpace + 'SI.ItemID
EA.ItemID AS ItemID, EA.ItemID AS ItemID,
EA.AccountName as TextSearch, EA.AccountName as TextSearch,
''ExchangeAccount'' as ColumnType, ''ExchangeAccount'' as ColumnType,
''ExchangeAccount'' as FullType, ''ExchangeAccountMailbox'' as FullType,
SI2.PackageID as PackageID, SI2.PackageID as PackageID,
EA.AccountID as AccountID EA.AccountID as AccountID
FROM @ItemsService AS I2 FROM @ItemsService AS I2

7
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/GlobalSearch.ascx.cs
View file

@ -48,6 +48,7 @@ namespace WebsitePanel.Portal.SkinControls
const string TYPE_DOMAIN = "Domain"; const string TYPE_DOMAIN = "Domain";
const string TYPE_ORGANIZATION = "Organization"; const string TYPE_ORGANIZATION = "Organization";
const string TYPE_EXCHANGEACCOUNT = "ExchangeAccount"; const string TYPE_EXCHANGEACCOUNT = "ExchangeAccount";
const string TYPE_EXCHANGEACCOUNT_MAILBOX = "ExchangeAccountMailbox";
const string PID_SPACE_WEBSITES = "SpaceWebSites"; const string PID_SPACE_WEBSITES = "SpaceWebSites";
const string PID_SPACE_DIMAINS = "SpaceDomains"; const string PID_SPACE_DIMAINS = "SpaceDomains";
const string PID_SPACE_EXCHANGESERVER = "SpaceExchangeServer"; const string PID_SPACE_EXCHANGESERVER = "SpaceExchangeServer";
@ -155,6 +156,12 @@ namespace WebsitePanel.Portal.SkinControls
"AccountID="+this.tbAccountId.Text,"Context=User", "AccountID="+this.tbAccountId.Text,"Context=User",
"moduleDefId=ExchangeServer"); "moduleDefId=ExchangeServer");
break; 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: default:
res = PortalUtils.GetSpaceHomePageUrl(itemId); res = PortalUtils.GetSpaceHomePageUrl(itemId);
break; break;