Merge pull request #2101 from TechnologyEnhancedLearning/Develop/Feature/TD-989_SuperAdminCentreRoleLimitFixes

TD-989_SuperAdminCentreRoleLimitFixes

Author: rshrirohit

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

@@ -360,32 +360,60 @@ public IActionResult CentreRoleLimits(int centreId = 0)
         [Route("SuperAdmin/Centres/{centreId=0:int}/CentreRoleLimits")]
         public IActionResult EditCentreRoleLimits(CentreRoleLimitsViewModel model)
         {
-            if (!ModelState.IsValid)
+            if (model.IsRoleLimitSetCmsAdministrators && model.RoleLimitCmsAdministrators == null)
             {
-                return View("CentreRoleLimits", model);
+                ModelState["RoleLimitCmsAdministrators.RoleLimitCmsAdministrators"]?.Errors.Clear();
             }
-
-            if (!(model.IsRoleLimitSetCmsAdministrators))
+            if (!model.IsRoleLimitSetCmsAdministrators)
             {
                 model.RoleLimitCmsAdministrators = -1;
             }
+            model.RoleLimitCmsAdministrators ??= -1;
 
-            if (!(model.IsRoleLimitSetCmsManagers))
+            if (model.IsRoleLimitSetCmsManagers && model.RoleLimitCmsManagers == null)
+            {
+                ModelState["RoleLimitCmsManagers.RoleLimitCmsManagers"]?.Errors.Clear();
+            }
+            if (!model.IsRoleLimitSetCmsManagers)
             {
                 model.RoleLimitCmsManagers = -1;
             }
-            if (!(model.IsRoleLimitSetContentCreatorLicences))
+            model.RoleLimitCmsManagers ??= -1;
+
+            if (model.IsRoleLimitSetContentCreatorLicences && model.RoleLimitContentCreatorLicences == null)
+            {
+                ModelState["RoleLimitContentCreatorLicences.RoleLimitContentCreatorLicences"]?.Errors.Clear();
+            }
+            if (!model.IsRoleLimitSetContentCreatorLicences)
             {
                 model.RoleLimitContentCreatorLicences = -1;
             }
-            if (!(model.IsRoleLimitSetCustomCourses))
+            model.RoleLimitContentCreatorLicences ??= -1;
+
+            if (model.IsRoleLimitSetCustomCourses && model.RoleLimitCustomCourses == null)
+            {
+                ModelState["RoleLimitCustomCourses.RoleLimitCustomCourses"]?.Errors.Clear();
+            }
+            if (!model.IsRoleLimitSetCustomCourses)
             {
                 model.RoleLimitCustomCourses = -1;
             }
-            if (!(model.IsRoleLimitSetTrainers))
+            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)
+            {
+                return View("CentreRoleLimits", model);
+            }
 
             centresDataService.UpdateCentreRoleLimits(
                 model.CentreId,

DigitalLearningSolutions.Web/ViewModels/SuperAdmin/Centres/CentreRoleLimitsViewModel.cs

@@ -11,24 +11,19 @@ public class CentreRoleLimitsViewModel
         public bool IsRoleLimitSetCustomCourses { get; set; }
         public bool IsRoleLimitSetTrainers { get; set; }
 
-        [Required(ErrorMessage = "Please enter a number for the CMS Administrators role limit.")]
         [Range(-1, int.MaxValue, ErrorMessage = "The role limit must be a non-negative whole number.")]
-        public int RoleLimitCmsAdministrators { get; set; }
+        public int? RoleLimitCmsAdministrators { get; set; }
 
-        [Required(ErrorMessage = "Please enter a number for the CMS Managers role limit.")]
         [Range(-1, int.MaxValue, ErrorMessage = "The role limit must be a non-negative whole number.")]
-        public int RoleLimitCmsManagers { get; set; }
+        public int? RoleLimitCmsManagers { get; set; }
 
-        [Required(ErrorMessage = "Please enter a number for the Content Creator Licences role limit.")]
         [Range(-1, int.MaxValue, ErrorMessage = "The role limit must be a non-negative whole number.")]
-        public int RoleLimitContentCreatorLicences { get; set; }
+        public int? RoleLimitContentCreatorLicences { get; set; }
 
-        [Required(ErrorMessage = "Please enter a number for the Custom Courses role limit.")]
         [Range(-1, int.MaxValue, ErrorMessage = "The role limit must be a non-negative whole number.")]
-        public int RoleLimitCustomCourses { get; set; }
+        public int? RoleLimitCustomCourses { get; set; }
 
-        [Required(ErrorMessage = "Please enter a number for the Trainers role limit.")]
         [Range(-1, int.MaxValue, ErrorMessage = "The role limit must be a non-negative whole number.")]
-        public int RoleLimitTrainers { get; set; }
+        public int? RoleLimitTrainers { get; set; }
     }
 }