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 2014-04-02 11:14:10 -04:00
commit 4f00418062
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/SpaceOrganizationsSelector.ascx.cs
View file

@ -56,7 +56,7 @@ namespace WebsitePanel.Portal.SkinControls
private void BindSpaceOrgs() private void BindSpaceOrgs()
{ {
// organization // organization
bool orgVisible = (PanelRequest.ItemID > 0); bool orgVisible = (PanelRequest.ItemID > 0 && Request[DefaultPage.PAGE_ID_PARAM].Equals(UserSpaceBreadcrumb.PID_SPACE_EXCHANGE_SERVER, StringComparison.InvariantCultureIgnoreCase));
spanOrgsSelector.Visible = orgVisible; spanOrgsSelector.Visible = orgVisible;

3
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/UserSpaceBreadcrumb.ascx.cs
View file

@ -47,6 +47,7 @@ namespace WebsitePanel.Portal.SkinControls
public partial class UserSpaceBreadcrumb : System.Web.UI.UserControl public partial class UserSpaceBreadcrumb : System.Web.UI.UserControl
{ {
public const string ORGANIZATION_CONTROL_KEY = "organization_home"; public const string ORGANIZATION_CONTROL_KEY = "organization_home";
public const string PID_SPACE_EXCHANGE_SERVER = "SpaceExchangeServer";
public const string EXCHANGE_SERVER_MODULE_DEFINTION_ID = "exchangeserver"; public const string EXCHANGE_SERVER_MODULE_DEFINTION_ID = "exchangeserver";
public const string PAGE_NANE_KEY = "Text.PageName"; public const string PAGE_NANE_KEY = "Text.PageName";
public const string DM_FOLDER_VIRTUAL_PATH = "~/DesktopModules/"; public const string DM_FOLDER_VIRTUAL_PATH = "~/DesktopModules/";
@ -112,7 +113,7 @@ namespace WebsitePanel.Portal.SkinControls
} }
// organization // organization
bool orgVisible = (PanelRequest.ItemID > 0); bool orgVisible = (PanelRequest.ItemID > 0 && Request[DefaultPage.PAGE_ID_PARAM].Equals(PID_SPACE_EXCHANGE_SERVER, StringComparison.InvariantCultureIgnoreCase));
spanOrgn.Visible = orgVisible; spanOrgn.Visible = orgVisible;