Merge pull request #64 from alejoroman0605/unable_create_new_role

Unable create new role

Author: WillStrohl

Modules/UserManager/App_LocalResources/RolesManageController.resx

@@ -123,7 +123,13 @@
   <data name="Disabled.Text" xml:space="preserve">
     <value>Disabled</value>
   </data>
+  <data name="GlobalRoles.Text" xml:space="preserve">
+    <value>Global Roles</value>
+  </data>
   <data name="Pending.Text" xml:space="preserve">
     <value>Pending</value>
   </data>
+  <data name="RoleNameExists.Text" xml:space="preserve">
+    <value>A role with that name already exists</value>
+  </data>
 </root>

Modules/UserManager/Controllers/RolesManageController.cs

@@ -18,10 +18,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 using DotNetNuke.Framework.JavaScriptLibraries;
+using DotNetNuke.Security.Roles;
 using DotNetNuke.Services.Localization;
 using DotNetNuke.Web.Mvc.Framework.ActionFilters;
 using DotNetNuke.Web.Mvc.Framework.Controllers;
-using System.Collections.Generic;
 using System.Web.Mvc;
 using Upendo.Modules.UserManager.Utility;
 using Upendo.Modules.UserManager.ViewModels;
@@ -32,6 +32,7 @@ namespace Upendo.Modules.UserManager.Controllers
     public class RolesManageController : DnnController
     {
         private readonly string ResourceFile = "~/DesktopModules/MVC/Upendo.Modules.UserManager/App_LocalResources/UserManageController.resx";
+        private readonly string RolesResourceFile = "~/DesktopModules/MVC/Upendo.Modules.UserManager/App_LocalResources/RolesManageController.resx";
 
         public RolesManageController()
         {
@@ -77,6 +78,18 @@ public ActionResult Create()
         [HttpPost]
         public ActionResult Create(RolesViewModel item)
         {
+            // Check if the RoleName is already in use
+            var portalId = ModuleContext.PortalId;
+            var rol = RoleController.Instance.GetRoleByName(portalId, item.RoleName);
+            if (rol != null)
+            {
+                ViewBag.RoleGroups = RolesRepository.GetRoleGroups(portalId);
+                ViewBag.StatusList = RolesRepository.StatusList();
+                ViewBag.ErrorMessage = Localization.GetString("RoleNameExists.Text", RolesResourceFile);
+                return View(item);
+            }
+
+            // If no validation issue, create the role
             RolesRepository.CreateRol(item);
             return RedirectToAction("Index");
         }
@@ -93,6 +106,19 @@ public ActionResult Edit(int itemId)
         [HttpPost]
         public ActionResult Edit(RolesViewModel item)
         {
+            // Check if the name has changed and if the new name is already in use
+            var portalId = ModuleContext.PortalId;
+            var originalRole = RoleController.Instance.GetRoleById(portalId, item.RoleId);
+            var existingRole = RoleController.Instance.GetRoleByName(portalId, item.RoleName);
+            if (originalRole != null && originalRole.RoleName != item.RoleName && existingRole != null)
+            {
+                ViewBag.RoleGroups = RolesRepository.GetRoleGroups(portalId);
+                ViewBag.StatusList = RolesRepository.StatusList();
+                ViewBag.ErrorMessage = Localization.GetString("RoleNameExists.Text", RolesResourceFile);
+                return View(item);
+            }
+
+            // If no validation issue, proceed with editing the role
             RolesRepository.EditRol(item);
             return RedirectToAction("Index");
         }
@@ -111,4 +137,4 @@ public ActionResult Delete(int itemId)
             return RedirectToAction("Index");
         }
     }
-}
+}

Modules/UserManager/Utility/RolesRepository.cs

@@ -86,9 +86,19 @@ public static List<RoleGroups> GetRoleGroups(int portalId)
         {
             var roleGroups = RoleController.GetRoleGroups(portalId).ToArray();
             var groups = new List<RoleGroups>();
+
+            string ResourceFile = "~/DesktopModules/MVC/Upendo.Modules.UserManager/App_LocalResources/RolesManageController.resx";
+            // Add global roles to the groups list
+            var rolGroup = new RoleGroups()
+            {
+                RoleGroupId = -1,
+                RoleGroupName = Localization.GetString("GlobalRoles.Text", ResourceFile),
+            };
+            groups.Add(rolGroup);
+
             foreach (RoleGroupInfo item in roleGroups)
             {
-                var rolGroup = new RoleGroups()
+                rolGroup = new RoleGroups()
                 {
                     RoleGroupId = item.RoleGroupID,
                     RoleGroupName = item.RoleGroupName,
@@ -135,13 +145,13 @@ public static void DeleteRol(int itemId, int portalId)
         public static List<object> StatusList()
         {
             string ResourceFile = "~/DesktopModules/MVC/Upendo.Modules.UserManager/App_LocalResources/RolesManageController.resx";
-            var statusList= new List<object>
+            var statusList = new List<object>
             {
+               new { Status = 1, Name = Localization.GetString("Approved.Text", ResourceFile) },
                new { Status = -1, Name = Localization.GetString("Pending.Text", ResourceFile) },
                new { Status = 0, Name = Localization.GetString("Disabled.Text", ResourceFile) },
-               new { Status = 1, Name = Localization.GetString("Approved.Text", ResourceFile) },
             };
-            return statusList;  
+            return statusList;
         }
     }
 }

Modules/UserManager/Views/RolesManage/Create.cshtml

@@ -7,6 +7,12 @@
     string ResourceFile = "~/DesktopModules/MVC/Upendo.Modules.UserManager/App_LocalResources/AddEditRoles.resx";
 }
 <div class="dnnDialog">
+    @if (!string.IsNullOrEmpty(ViewBag.ErrorMessage))
+    {
+        <div class="dnnFormMessage dnnFormError">
+            <p>@ViewBag.ErrorMessage</p>
+        </div>
+    }
     <fieldset>
         <div class="dnnFormItem">
             <div><label>@Localization.GetString("RoleName", @ResourceFile)</label></div>

Modules/UserManager/Views/RolesManage/Edit.cshtml

@@ -8,6 +8,12 @@
 }
 
 <div class="dnnDialog">
+    @if (!string.IsNullOrEmpty(ViewBag.ErrorMessage))
+    {
+        <div class="dnnFormMessage dnnFormError">
+            <p>@ViewBag.ErrorMessage</p>
+        </div>
+    }
     <fieldset>
         <div class="dnnFormItem">
             <div><label>@Localization.GetString("RoleName", @ResourceFile)</label></div>