From b124b301ccf8fbabd1a5dc8e9b47f9470a6ec370 Mon Sep 17 00:00:00 2001 From: robvde Date: Thu, 19 Jul 2012 16:53:12 +0400 Subject: [PATCH] Fixed the issues where reseller and administrators are not able to delete a tenant (WSP user account) --- .../DesktopModules/WebsitePanel/UserAccountDetails.ascx.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountDetails.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountDetails.ascx.cs index 5fecd227..5492d0fe 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountDetails.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountDetails.ascx.cs @@ -97,8 +97,11 @@ namespace WebsitePanel.Portal lnkChangePassword.Visible = !((PanelSecurity.SelectedUserId == PanelSecurity.EffectiveUserId) && PanelSecurity.LoggedUser.IsPeer); lnkDelete.NavigateUrl = EditUrl("UserID", PanelSecurity.SelectedUserId.ToString(), "delete"); - if ((PanelSecurity.LoggedUser.Role != UserRole.Reseller) | (PanelSecurity.LoggedUser.Role != UserRole.Administrator)) lnkDelete.Visible = false; - else lnkDelete.Visible = (PanelSecurity.SelectedUserId != PanelSecurity.EffectiveUserId); + + if (!((PanelSecurity.LoggedUser.Role == UserRole.Reseller) | (PanelSecurity.LoggedUser.Role == UserRole.Administrator))) + lnkDelete.Visible = false; + else + lnkDelete.Visible = (PanelSecurity.SelectedUserId != PanelSecurity.EffectiveUserId); } }