From 7ec2cd7e20721d6846d3c8df922db21d0597c755 Mon Sep 17 00:00:00 2001
From: robvde <robvde@ROBVDE912.europe.corp.microsoft.com>
Date: Mon, 30 Jul 2012 15:57:24 +0400
Subject: [PATCH] Fixed: Left menu (UserAccountMenu) did not interpret the
 roles. Ensured it interprets the role of logged-on user.

---
 .../App_Data/ModulesData.config               | 20 +++++++++----------
 .../WebsitePanel/UserAccountMenu.ascx.cs      |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/ModulesData.config b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/ModulesData.config
index 65182013..9afcf166 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/ModulesData.config
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/ModulesData.config
@@ -2,15 +2,15 @@
 <ModulesData>
 
 	<ModuleData id="UserMenu">
-		<MenuItem pageID="UserCustomers" roles="Administrator,Reseller"/>
-		<MenuItem pageID="UserSpaces" roles="Administrator,Reseller,User"/>
-		<MenuItem pageID="HostingPlans" roles="Administrator,Reseller"/>
-		<MenuItem pageID="HostingAddons" roles="Administrator,Reseller"/>
-		<MenuItem pageID="UserPeers" roles="Administrator,Reseller,User"/>
-		<MenuItem pageID="UserTasks" roles="Administrator,Reseller,User"/>
-		<MenuItem pageID="AuditLog" roles="Administrator,Reseller,User"/>
-		<MenuItem pageID="ecOnlineStore" roles="Reseller,User" ecuser="true" />
-		<MenuItem pageID="ecEcommerceAdmin" roles="Administrator,Reseller" ecadmin="true">
+		<MenuItem pageID="UserCustomers" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk"/>
+		<MenuItem pageID="UserSpaces" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User"/>
+		<MenuItem pageID="HostingPlans" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk"/>
+		<MenuItem pageID="HostingAddons" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk"/>
+		<MenuItem pageID="UserPeers" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User"/>
+		<MenuItem pageID="UserTasks" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User"/>
+		<MenuItem pageID="AuditLog" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User"/>
+		<MenuItem pageID="ecOnlineStore" roles="Reseller,ResellerCSR,ResellerHelpdesk,User" ecuser="true" />
+		<MenuItem pageID="ecEcommerceAdmin" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk" ecadmin="true">
 			<MenuItems>
 				<MenuItem pageID="ecEcommerceSettings" ecommerce="true" />
 				<MenuItem pageID="ecBillingCycles" />
@@ -24,7 +24,7 @@
 				<MenuItem pageID="ecCustomersServices" />
 			</MenuItems>
 		</MenuItem>
-		<MenuItem pageID="ecMyEcommerce" ecuser="true" roles="Reseller,User">
+		<MenuItem pageID="ecMyEcommerce" ecuser="true" roles="Reseller,ResellerCSR,ResellerHelpdesk,User">
 			<MenuItems>
 				<MenuItem pageID="ecPaymentProfile" />
 				<MenuItem pageID="ecMyPayments" />
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountMenu.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountMenu.ascx.cs
index 8d77126b..032aa19d 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountMenu.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountMenu.ascx.cs
@@ -101,7 +101,7 @@ namespace WebsitePanel.Portal
                 {
                     display = false;
                     string[] arrRoles = roles.Split(',');
-                    string userRole = PanelSecurity.SelectedUser.Role.ToString();
+                    string userRole = PanelSecurity.LoggedUser.Role.ToString();
                     foreach (string role in arrRoles)
                     {
                         if (String.Compare(userRole, role, true) == 0)