Merge pull request #2848 from TechnologyEnhancedLearning/Develop/Features/TD-4383-Warncentreadminsthatactiveadminaccountexistswheninactivatingdelegateaccount

rshrirohit · web-flow · commit c3e63fb1dcab · 2024-09-20T09:35:26.000+01:00
TD-4383 Removing of Active from the Admin Role
diff --git a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/DeactivateDelegateController.cs b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/DeactivateDelegateController.cs
@@ -86,7 +86,7 @@ public IActionResult Index(DeactivateDelegateAccountViewModel deactivateDelegate
             if (adminAccount != null)
             {
                 var adminentity = new AdminEntity(adminAccount, userEntity.UserAccount, null);
-                roles = FilterableTagHelper.GetCurrentTagsForAdmin(adminentity).Where(s => s.Hidden == false)
+                roles = FilterableTagHelper.GetCurrentTagsForAdmin(adminentity).Where(s => s.Hidden == false && s.DisplayText != "Active")
                                                 .Select(d => d.DisplayText).ToList<string>();
             }
             return roles;

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public IActionResult Index(DeactivateDelegateAccountViewModel deactivateDelegate`
`86`	`86`	`if (adminAccount != null)`
`87`	`87`	`{`
`88`	`88`	`var adminentity = new AdminEntity(adminAccount, userEntity.UserAccount, null);`
`89`		`- roles = FilterableTagHelper.GetCurrentTagsForAdmin(adminentity).Where(s => s.Hidden == false)`
	`89`	`+ roles = FilterableTagHelper.GetCurrentTagsForAdmin(adminentity).Where(s => s.Hidden == false && s.DisplayText != "Active")`
`90`	`90`	`.Select(d => d.DisplayText).ToList<string>();`
`91`	`91`	`}`
`92`	`92`	`return roles;`