From f0a474d7ba38f67893385274585f6fbba516c789 Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Wed, 2 Apr 2014 04:37:49 +0300
Subject: [PATCH] UserSpaceBreadcrumb bug fixed

---
 .../SkinControls/SpaceOrganizationsSelector.ascx.cs            | 2 +-
 .../WebsitePanel/SkinControls/UserSpaceBreadcrumb.ascx.cs      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/SpaceOrganizationsSelector.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/SpaceOrganizationsSelector.ascx.cs
index be8c6149..869ef78c 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/SpaceOrganizationsSelector.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/SpaceOrganizationsSelector.ascx.cs
@@ -56,7 +56,7 @@ namespace WebsitePanel.Portal.SkinControls
         private void BindSpaceOrgs()
         {
             // 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;
 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/UserSpaceBreadcrumb.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/UserSpaceBreadcrumb.ascx.cs
index 2e3ed2b2..37da37d8 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/UserSpaceBreadcrumb.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/UserSpaceBreadcrumb.ascx.cs
@@ -47,6 +47,7 @@ namespace WebsitePanel.Portal.SkinControls
     public partial class UserSpaceBreadcrumb : System.Web.UI.UserControl
     {
         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 PAGE_NANE_KEY = "Text.PageName";
         public const string DM_FOLDER_VIRTUAL_PATH = "~/DesktopModules/";
@@ -112,7 +113,7 @@ namespace WebsitePanel.Portal.SkinControls
             }
 
             // 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;