Fixed Save button validation issue.

Author: martinfoster-hee

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

@@ -289,6 +289,8 @@ public IActionResult ManageCentreManager(EditCentreManagerDetailsViewModel editC
             return RedirectToAction("ManageCentre", "Centres", new { centreId = editCentreManagerDetailsViewModel.CentreId });
         }
 
+        [HttpGet]
+        [NoCaching]
         [Route("SuperAdmin/Centres/{centreId=0:int}/CentreRoleLimits")]
         public IActionResult CentreRoleLimits(int centreId = 0)
         {
@@ -303,7 +305,6 @@ public IActionResult CentreRoleLimits(int centreId = 0)
 
             if (!(roleLimits.RoleLimitCmsAdministrators != null && roleLimits.RoleLimitCmsAdministrators != -1))
             {
-                centreRoleLimitsViewModel.RoleLimitCmsAdministrators = null;
                 centreRoleLimitsViewModel.IsRoleLimitSetCmsAdministrators = false;
             }
             else
@@ -314,7 +315,6 @@ public IActionResult CentreRoleLimits(int centreId = 0)
 
             if (!(roleLimits.RoleLimitCmsManagers != null && roleLimits.RoleLimitCmsManagers != -1))
             {
-                centreRoleLimitsViewModel.RoleLimitCmsManagers = null;
                 centreRoleLimitsViewModel.IsRoleLimitSetCmsManagers = false;
             }
             else
@@ -325,7 +325,6 @@ public IActionResult CentreRoleLimits(int centreId = 0)
 
             if (!(roleLimits.RoleLimitCcLicences != null && roleLimits.RoleLimitCcLicences != -1))
             {
-                centreRoleLimitsViewModel.RoleLimitContentCreatorLicences = null;
                 centreRoleLimitsViewModel.IsRoleLimitSetContentCreatorLicences = false;
             }
             else
@@ -336,7 +335,6 @@ public IActionResult CentreRoleLimits(int centreId = 0)
 
             if (!(roleLimits.RoleLimitCustomCourses != null && roleLimits.RoleLimitCustomCourses != -1))
             {
-                centreRoleLimitsViewModel.RoleLimitCustomCourses = null;
                 centreRoleLimitsViewModel.IsRoleLimitSetCustomCourses = false;
             }
             else
@@ -347,7 +345,6 @@ public IActionResult CentreRoleLimits(int centreId = 0)
 
             if (!(roleLimits.RoleLimitTrainers != null && roleLimits.RoleLimitTrainers != -1))
             {
-                centreRoleLimitsViewModel.RoleLimitTrainers = null;
                 centreRoleLimitsViewModel.IsRoleLimitSetTrainers = false;
             }
             else
@@ -363,6 +360,11 @@ public IActionResult CentreRoleLimits(int centreId = 0)
         [Route("SuperAdmin/Centres/{centreId=0:int}/CentreRoleLimits")]
         public IActionResult EditCentreRoleLimits(CentreRoleLimitsViewModel model)
         {
+            if (!ModelState.IsValid)
+            {
+                return View("CentreRoleLimits", model);
+            }
+
             if (!(model.IsRoleLimitSetCmsAdministrators))
             {
                 model.RoleLimitCmsAdministrators = -1;
@@ -385,11 +387,6 @@ public IActionResult EditCentreRoleLimits(CentreRoleLimitsViewModel model)
                 model.RoleLimitTrainers = -1;
             }
 
-            if (!ModelState.IsValid)
-            {
-                return View("CentreRoleLimits", model);
-            }
-
             centresDataService.UpdateCentreRoleLimits(
                 model.CentreId,
                 model.RoleLimitCmsAdministrators,

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

@@ -13,22 +13,22 @@ public class CentreRoleLimitsViewModel
 
         [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; }
     }
 }