Generate URLs consistently

Also apply changes from Create to GroupEdit

Author: bdukes

DNN Platform/Modules/Groups/Create.ascx.cs

@@ -102,7 +102,8 @@ protected void Page_Load(object sender, EventArgs e)
 
     private void Cancel_Click(object sender, EventArgs e)
     {
-        this.Response.Redirect(this.ModuleContext.NavigateUrl(this.TabId, string.Empty, false, null));
+        var groupListingUrl = this.navigationManager.NavigateURL(this.TabId);
+        this.Response.Redirect(groupListingUrl);
     }
 
     private void Create_Click(object sender, EventArgs e)
@@ -215,6 +216,7 @@ private void Create_Click(object sender, EventArgs e)
             GroupUtilities.CreateJournalEntry(roleInfo, this.UserInfo);
         }
 
-        this.Response.Redirect(this.ModuleContext.NavigateUrl(this.TabId, string.Empty, false, null));
+        var groupListingUrl = this.navigationManager.NavigateURL(this.TabId);
+        this.Response.Redirect(groupListingUrl);
     }
 }

DNN Platform/Modules/Groups/GroupEdit.ascx.cs

@@ -68,30 +68,31 @@ protected override void OnInit(EventArgs e)
     /// <param name="e">The event args.</param>
     protected void Page_Load(object sender, EventArgs e)
     {
-        JavaScript.RequestRegistration(this.appStatus, this.eventLogger, this.PortalSettings, CommonJs.DnnPlugins);
-
-        this.imgGroup.Src = this.Page.ResolveUrl("~/DesktopModules/SocialGroups/Images/") + "sample-group-profile.jpg";
-        if (this.Page.IsPostBack || this.GroupId <= 0)
-        {
-            return;
-        }
-
         var roleInfo = this.roleController.GetRoleById(this.PortalId, this.GroupId);
-        if (roleInfo == null)
+        if (this.GroupId > 0 && roleInfo == null)
         {
-            this.Response.Redirect(this.ModuleContext.NavigateUrl(this.TabId, string.Empty, false));
+            var groupListingUrl = this.navigationManager.NavigateURL(this.TabId);
+            this.Response.Redirect(groupListingUrl);
             return;
         }
 
         if (!this.UserInfo.IsInRole(this.PortalSettings.AdministratorRoleName))
         {
             if (roleInfo.CreatedByUserID != this.UserInfo.UserID)
             {
-                this.Response.Redirect(
-                    this.ModuleContext.NavigateUrl(this.TabId, string.Empty, false, $"groupid={this.GroupId}"));
+                var viewGroupUrl = this.navigationManager.NavigateURL(this.TabId, string.Empty, $"groupid={this.GroupId}");
+                this.Response.Redirect(viewGroupUrl);
             }
         }
 
+        JavaScript.RequestRegistration(this.appStatus, this.eventLogger, this.PortalSettings, CommonJs.DnnPlugins);
+
+        this.imgGroup.Src = this.Page.ResolveUrl("~/DesktopModules/SocialGroups/Images/sample-group-profile.jpg");
+        if (this.Page.IsPostBack || this.GroupId <= 0)
+        {
+            return;
+        }
+
         this.txtGroupName.Visible = !roleInfo.IsSystemRole;
         this.reqGroupName.Enabled = !roleInfo.IsSystemRole;
 
@@ -118,7 +119,8 @@ protected void Page_Load(object sender, EventArgs e)
 
     private void Cancel_Click(object sender, EventArgs e)
     {
-        this.Response.Redirect(this.ModuleContext.NavigateUrl(this.TabId, string.Empty, false, $"groupid={this.GroupId}"));
+        var viewGroupUrl = this.navigationManager.NavigateURL(this.TabId, string.Empty, $"groupid={this.GroupId}");
+        this.Response.Redirect(viewGroupUrl);
     }
 
     private void Save_Click(object sender, EventArgs e)
@@ -161,14 +163,7 @@ private void Save_Click(object sender, EventArgs e)
             roleInfo.Description = this.txtDescription.Text;
             roleInfo.IsPublic = this.rdAccessTypePublic.Checked;
 
-            if (roleInfo.Settings.ContainsKey("ReviewMembers"))
-            {
-                roleInfo.Settings["ReviewMembers"] = this.chkMemberApproved.Checked.ToString();
-            }
-            else
-            {
-                roleInfo.Settings.Add("ReviewMembers", this.chkMemberApproved.Checked.ToString());
-            }
+            roleInfo.Settings["ReviewMembers"] = this.chkMemberApproved.Checked.ToString();
 
             this.roleController.UpdateRoleSettings(roleInfo, true);
             this.roleController.UpdateRole(roleInfo);
@@ -178,19 +173,17 @@ private void Save_Click(object sender, EventArgs e)
                 var groupFolder = this.folderManager.GetFolder(this.PortalSettings.PortalId, $"Groups/{roleInfo.RoleID}") ??
                                   this.folderManager.AddFolder(this.PortalSettings.PortalId, $"Groups/{roleInfo.RoleID}");
 
-                if (groupFolder != null)
-                {
-                    var fileName = Path.GetFileName(this.inpFile.PostedFile.FileName);
-                    var fileInfo = this.fileManager.AddFile(groupFolder, fileName, this.inpFile.PostedFile.InputStream, true, true, this.fileContentTypeManager.GetContentType(Path.GetExtension(fileName)));
-                    roleInfo.IconFile = $"FileID={fileInfo.FileId}";
-                    this.roleController.UpdateRole(roleInfo);
-                }
+                var fileName = Path.GetFileName(this.inpFile.PostedFile.FileName);
+                var fileInfo = this.fileManager.AddFile(groupFolder, fileName, this.inpFile.PostedFile.InputStream, true, true, this.fileContentTypeManager.GetContentType(Path.GetExtension(fileName)));
+                roleInfo.IconFile = $"FileID={fileInfo.FileId}";
+                this.roleController.UpdateRole(roleInfo);
             }
 
             // Clear Roles Cache
             DataCache.RemoveCache("GetRoles");
         }
 
-        this.Response.Redirect(this.navigationManager.NavigateURL(this.TabId, string.Empty, $"groupid={this.GroupId}"));
+        var viewGroupUrl = this.navigationManager.NavigateURL(this.TabId, string.Empty, $"groupid={this.GroupId}");
+        this.Response.Redirect(viewGroupUrl);
     }
 }