Fixed limit not set overrides and associated unit test

Author: martinfoster-hee

DigitalLearningSolutions.Web.Tests/Controllers/SuperAdmin/CentresControllerTests.cs

@@ -110,9 +110,9 @@ public void CentreRoleLimits_route_loads_existing_role_limits_with_derived_flags
             var expectedVm = new CentreRoleLimitsViewModel
             {
                 CentreId = 374,
-                RoleLimitCmsAdministrators = 0,
+                RoleLimitCmsAdministrators = null,
                 IsRoleLimitSetCmsAdministrators = false,    // automatically set off
-                RoleLimitCmsManagers = 0,
+                RoleLimitCmsManagers = null,
                 IsRoleLimitSetCmsManagers = false,          // automatically set off
                 IsRoleLimitSetContentCreatorLicences = true,
                 RoleLimitContentCreatorLicences = 10,

DigitalLearningSolutions.Web/Controllers/SuperAdmin/Centres/CentresController.cs

@@ -364,30 +364,50 @@ public IActionResult EditCentreRoleLimits(CentreRoleLimitsViewModel model)
             {
                 ModelState["RoleLimitCmsAdministrators.RoleLimitCmsAdministrators"]?.Errors.Clear();
             }
+            if (!model.IsRoleLimitSetCmsAdministrators)
+            {
+                model.RoleLimitCmsAdministrators = -1;
+            }
             model.RoleLimitCmsAdministrators ??= -1;
 
             if (model.IsRoleLimitSetCmsManagers && model.RoleLimitCmsManagers == null)
             {
                 ModelState["RoleLimitCmsManagers.RoleLimitCmsManagers"]?.Errors.Clear();
             }
+            if (!model.IsRoleLimitSetCmsManagers)
+            {
+                model.RoleLimitCmsManagers = -1;
+            }
             model.RoleLimitCmsManagers ??= -1;
 
             if (model.IsRoleLimitSetContentCreatorLicences && model.RoleLimitContentCreatorLicences == null)
             {
                 ModelState["RoleLimitContentCreatorLicences.RoleLimitContentCreatorLicences"]?.Errors.Clear();
             }
+            if (!model.IsRoleLimitSetContentCreatorLicences)
+            {
+                model.RoleLimitContentCreatorLicences = -1;
+            }
             model.RoleLimitContentCreatorLicences ??= -1;
 
             if (model.IsRoleLimitSetCustomCourses && model.RoleLimitCustomCourses == null)
             {
                 ModelState["RoleLimitCustomCourses.RoleLimitCustomCourses"]?.Errors.Clear();
             }
+            if (!model.IsRoleLimitSetCustomCourses)
+            {
+                model.RoleLimitCustomCourses = -1;
+            }
             model.RoleLimitCustomCourses ??= -1;
 
             if (model.IsRoleLimitSetTrainers && model.RoleLimitTrainers == null)
             {
                 ModelState["RoleLimitTrainers.RoleLimitTrainers"]?.Errors.Clear();
             }
+            if (!model.IsRoleLimitSetTrainers)
+            {
+                model.RoleLimitTrainers = -1;
+            }
             model.RoleLimitTrainers ??= -1;
 
             if (!ModelState.IsValid)