Merge pull request #795 from johnhenley/timo/forumgroupid-token-forum…

…view ENH: support [GROUPNAME] [FORUMGROUPID] tokens in [GROUP] section in ForumView
DNNCommunity · May 12, 2024 · 79816c4 · 79816c4
2 parents fd567f2 + 91660e5
commit 79816c4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Dnn.CommunityForums/CustomControls/UserControls/ForumView.cs b/Dnn.CommunityForums/CustomControls/UserControls/ForumView.cs
@@ -265,6 +265,8 @@ public string BuildForumView()
 
                                         //any replacements on the group
                                         string sNewGroup = "<div id=\"group" + GroupId + "\" class=\"afgroup\">" + sGroup + "</div>";
+                                        sNewGroup = sNewGroup.Replace("[FORUMGROUPID]", fi.ForumGroupId.ToString());
+                                        sNewGroup = sNewGroup.Replace("[GROUPNAME]", fi.GroupName);
                                         sGroupSectionTemp = TemplateUtils.ReplaceSubSection(sGroupSectionTemp, sNewGroup, "[GROUP]", "[/GROUP]");
                                         sGroupSection += sGroupSectionTemp;
                                         tmpGroup = fi.GroupName;

diff --git a/Dnn.CommunityForums/themes/community-bootstrap/templates/ForumView.ascx b/Dnn.CommunityForums/themes/community-bootstrap/templates/ForumView.ascx
@@ -5,13 +5,13 @@
 <div class="dcf-forums">
 		<div class="dcf-group-title-wrap d-flex align-items-center py-2">
 			<h3 class="dcf-group-title h5 flex-grow-1">[RESX:Group]: [GROUPNAME]</h3>
-			<a class="bs-collapse" data-toggle="collapse" href="#forum-group-1">
+			<a class="bs-collapse" data-toggle="collapse" href="#forum-group-[FORUMGROUPID]" role="button" data-bs-toggle="collapse">
 				<i class="fa fa-chevron-circle-down fa-lg"></i>
 			</a>
 		</div>
 
 			[GROUP]
-			<div id="forum-group-1"  class="dcf-forums-group collapse show">
+			<div id="forum-group-[FORUMGROUPID]"  class="dcf-forums-group collapse show">
 				<table class="dcf-table dcf-table-100 table table-responsive-md">
 					<thead>
 						<tr class="dcf-table-head-row">