Skip to content

Commit 1b168a4

Browse files
WillStrohlWillStrohl
authored
Merge pull request #967 from DNNCommunity/dev
Sync master and dev
2 parents 403a180 + 31e1715 commit 1b168a4

16 files changed

+74
-48
lines changed

‎Dnn.CommunityForums/Controllers/ForumController.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,6 @@ public XmlDocument GetForumListXML(int PortalId, int ModuleId)
277277
}
278278
public int Forums_Save(int portalId, DotNetNuke.Modules.ActiveForums.Entities.ForumInfo fi, bool isNew, bool useGroupFeatures, bool useGroupSecurity)
279279
{
280-
var permissionsId = -1;
281280
var fg = new DotNetNuke.Modules.ActiveForums.Controllers.ForumGroupController().GetById(fi.ForumGroupId, fi.ModuleId);
282281
if (useGroupSecurity)
283282
{
@@ -288,10 +287,11 @@ public int Forums_Save(int portalId, DotNetNuke.Modules.ActiveForums.Entities.Fo
288287
}
289288
else
290289
{
291-
fi.PermissionsId = new DotNetNuke.Modules.ActiveForums.Controllers.PermissionController().CreateAdminPermissions(DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.GetAdministratorsRoleId(portalId).ToString()).PermissionsId;
292-
DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.CreateDefaultSets(portalId, fi.PermissionsId);
293-
permissionsId = fi.PermissionsId;
294-
isNew = true;
290+
if (isNew || (fi?.PermissionsId == fg?.PermissionsId)) /* new forum or switching from group security to forum security */
291+
{
292+
fi.PermissionsId = new DotNetNuke.Modules.ActiveForums.Controllers.PermissionController().CreateAdminPermissions(DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.GetAdministratorsRoleId(portalId).ToString()).PermissionsId;
293+
DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.CreateDefaultSets(portalId, fi.PermissionsId);
294+
}
295295
}
296296
fi.ForumSettingsKey = useGroupFeatures ? (fg != null ? fg.GroupSettingsKey : string.Empty) : (fi.ForumID > 0 ? $"F:{fi.ForumID}" : string.Empty);
297297

‎Dnn.CommunityForums/DnnCommunityForums.dnn

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dotnetnuke type="Package" version="5.0">
22
<packages>
3-
<package name="Active Forums" type="Module" version="08.01.01">
3+
<package name="Active Forums" type="Module" version="08.01.02">
44
<friendlyName>DNN Community Forums</friendlyName>
55
<description>DNN Community Forums: The official online forums module for the DNN Community.</description>
66
<iconFile>DesktopModules/ActiveForums/images/branding/logo/DNN-Community-Forums-Icon-64px.png</iconFile>
@@ -86,7 +86,7 @@
8686
<assembly>
8787
<name>DotNetNuke.Modules.ActiveForums.dll</name>
8888
<sourceFileName>bin\DotNetNuke.Modules.ActiveForums.dll</sourceFileName>
89-
<version>08.01.01</version>
89+
<version>08.01.02</version>
9090
</assembly>
9191
</assemblies>
9292
</component>
@@ -392,7 +392,7 @@
392392
<script type="UnInstall">
393393
<path>sql</path>
394394
<name>Uninstall.SqlDataProvider</name>
395-
<version>08.01.01</version>
395+
<version>08.01.02</version>
396396
</script>
397397
</scripts>
398398
</component>
@@ -433,7 +433,7 @@
433433
</components>
434434
</package>
435435

436-
<package name="Active Forums What's New" type="Module" version="08.01.01">
436+
<package name="Active Forums What's New" type="Module" version="08.01.02">
437437

438438
<friendlyName>DNN Community Forums What's New</friendlyName>
439439
<foldername>ActiveForumsWhatsNew</foldername>
@@ -503,7 +503,7 @@
503503
</components>
504504
</package>
505505

506-
<package name="Active Forums Viewer" type="Module" version="08.01.01">
506+
<package name="Active Forums Viewer" type="Module" version="08.01.02">
507507
<friendlyName>DNN Community Forums Forums Viewer</friendlyName>
508508
<foldername>ActiveForumsViewer</foldername>
509509
<description>DNN Community Forums: Display any forum topic view on any page within your site.</description>

‎Dnn.CommunityForums/DnnCommunityForums_Symbols.dnn

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dotnetnuke type="Package" version="5.0">
22
<packages>
3-
<package name="Active Forums_Symbols" type="Library" version="08.01.01">
3+
<package name="Active Forums_Symbols" type="Library" version="08.01.02">
44

55
<friendlyName>DNN Community Forums Symbols</friendlyName>
66
<description>DNN Community Forums: The official online forums module for the DNN Community.</description>
@@ -15,9 +15,7 @@
1515
<releaseNotes src="ReleaseNotes.txt" />
1616
<azureCompatible>True</azureCompatible>
1717
<dependencies>
18-
19-
<dependency type="managedPackage" version="8.1.1">Active Forums</dependency>
20-
18+
<dependency type="managedPackage" version="8.1.2">Active Forums</dependency>
2119
</dependencies>
2220
<components>
2321
<component type="ResourceFile">

‎Dnn.CommunityForums/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@
5353
// You can specify all the values or you can default the Build and Revision Numbers
5454
// by using the '*' as shown below:
5555

56-
[assembly: AssemblyVersion("08.01.01")]
56+
[assembly: AssemblyVersion("08.01.02")]
5757

58-
[assembly: AssemblyFileVersion("08.01.01")]
58+
[assembly: AssemblyFileVersion("08.01.02")]
5959

6060

6161
[assembly: WebResource("DotNetNuke.Modules.ActiveForums.CustomControls.Resources.cb.js", "text/javascript")]

‎Dnn.CommunityForums/ReleaseNotes.txt

+24-13
Original file line numberDiff line numberDiff line change
@@ -96,18 +96,29 @@
9696
<div class="dnnClear">
9797
<h2>Release Notes</h2>
9898
<hr />
99-
<h3>08.01.01<!-- <span class="muy-importante">RELEASE CANDIDATE 1</span>--></h3>
99+
<h3>08.01.02</h3>
100100

101-
<!--
102-
<p class="muy-importante">
103-
<strong>IMPORTANT!!!</strong> This is a release candidate (RC). Please <strong>DO NOT</strong> use this installation/upgrade package for any production
104-
websites of any kind.
105-
</p>
101+
<h4>New Features &amp; Enhancements</h4>
102+
<ul>
103+
<li>UPDATE: Make sure Filtered Topics dropdown text is visibile on mobile (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/959">Issue 959</a>, thanks <a href="https://github.com/Timo-Breumelhof" target="_blank">@Timo-Breumelhof</a>!)</li>
104+
<!--<li>UPDATE: (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/">Issue </a>, thanks <a href="https://github.com/" target="_blank">@</a>!)</li>-->
105+
</ul>
106106

107-
<p class="muy-importante">This release is <strong>not supported</strong> and is <strong>only provided for testing purposes</strong>, to allow others to test
108-
their websites first, before we deploy an official release.
109-
</p>
110-
-->
107+
<h4>Bug Fixes</h4>
108+
<ul>
109+
<li>BUG: Not redirected to new page after submitting edits to an existing reply (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/963">Issue 963</a>, thanks <a href="https://github.com/johnhenley" target="_blank">@johnhenley</a>!)</li>
110+
<li>BUG: Clicking Save in forum control panel restores default security when forum is not inheriting security from group (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/964">Issue 964</a>, thanks <a href="https://github.com/johnhenley" target="_blank">@johnhenley</a>!)</li>
111+
<!--<li>FIXED: (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/">Issue </a>, thanks <a href="https://github.com/" target="_blank">@</a>!)</li>-->
112+
</ul>
113+
114+
<h4>Tasks / Development Updates (and Technical Debt)</h4>
115+
<ul>
116+
<li>None at this time.</li>
117+
<!--<li>TASK: (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/">Issue </a>, thanks <a href="https://github.com/" target="_blank">@</a>!)</li>-->
118+
</ul>
119+
<hr />
120+
121+
<h3>08.01.01</h3>
111122

112123
<h4>New Features &amp; Enhancements</h4>
113124
<ul>
@@ -117,7 +128,7 @@
117128
<li>UPDATE: Added Alignment for 'Next' in the community-default Forum Theme (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/934">Issue 934</a>, thanks <a href="https://github.com/Timo-Breumelhof" target="_blank">@Timo-Breumelhof</a>!)</li>
118129
<!--<li>UPDATE: (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/">Issue </a>, thanks <a href="https://github.com/" target="_blank">@</a>!)</li>-->
119130
</ul>
120-
131+
121132
<h4>Bug Fixes</h4>
122133
<ul>
123134
<li>BUG: [DISPLAYNAME] Not Included in Email Notifications (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/923">Issue 923</a>, thanks <a href="https://github.com/johnhenley" target="_blank">@johnhenley</a>!)</li>
@@ -127,13 +138,13 @@
127138
<li>BUG: Moderation Email Not Sent if Disapproving a New Topic (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/938">Issue 938</a>, thanks <a href="https://github.com/johnhenley" target="_blank">@johnhenley</a>!)</li>
128139
<!--<li>FIXED: (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/">Issue </a>, thanks <a href="https://github.com/" target="_blank">@</a>!)</li>-->
129140
</ul>
130-
141+
131142
<h4>Tasks / Development Updates (and Technical Debt)</h4>
132143
<ul>
133144
<li>None at this time.</li>
134145
<!--<li>TASK: (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/">Issue </a>, thanks <a href="https://github.com/" target="_blank">@</a>!)</li>-->
135146
</ul>
136-
<hr />
147+
<hr />
137148

138149
<h3>08.01.00<!-- <span class="muy-importante">RELEASE CANDIDATE 1</span>--></h3>
139150

‎Dnn.CommunityForums/controls/af_post.ascx.cs

+10-15
Original file line numberDiff line numberDiff line change
@@ -982,22 +982,17 @@ private void SaveReply()
982982
if (!_isEdit)
983983
{
984984
DotNetNuke.Modules.ActiveForums.Controllers.ReplyController.QueueApprovedReplyAfterAction(PortalId, TabId, ModuleId, _fi.ForumGroupId, ForumId, TopicId, tmpReplyId, ri.Content.AuthorId);
985-
986-
var ctlUtils = new ControlUtils();
987-
var fullURL = ctlUtils.BuildUrl(TabId, ForumModuleId, ForumInfo.ForumGroup.PrefixURL, ForumInfo.PrefixURL, ForumInfo.ForumGroupId, ForumInfo.ForumID, TopicId, ri.Topic.TopicUrl, -1, -1, string.Empty, 1, tmpReplyId, SocialGroupId);
988-
989-
if (fullURL.Contains("~/"))
990-
{
991-
fullURL = Utilities.NavigateURL(TabId, "", new[] { ParamKeys.TopicId + "=" + TopicId, ParamKeys.ContentJumpId + "=" + tmpReplyId });
992-
}
993-
if (fullURL.EndsWith("/"))
994-
{
995-
fullURL += Utilities.UseFriendlyURLs(ForumModuleId) ? String.Concat("#", tmpReplyId) : String.Concat("?", ParamKeys.ContentJumpId, "=", tmpReplyId);
996-
}
997-
if (!_isEdit)
998-
999-
Response.Redirect(fullURL);
1000985
}
986+
var fullURL = new ControlUtils().BuildUrl(TabId, ForumModuleId, ForumInfo.ForumGroup.PrefixURL, ForumInfo.PrefixURL, ForumInfo.ForumGroupId, ForumInfo.ForumID, TopicId, ri.Topic.TopicUrl, -1, -1, string.Empty, 1, tmpReplyId, SocialGroupId);
987+
if (fullURL.Contains("~/"))
988+
{
989+
fullURL = Utilities.NavigateURL(TabId, "", new[] { ParamKeys.TopicId + "=" + TopicId, ParamKeys.ContentJumpId + "=" + tmpReplyId });
990+
}
991+
if (fullURL.EndsWith("/"))
992+
{
993+
fullURL += Utilities.UseFriendlyURLs(ForumModuleId) ? String.Concat("#", tmpReplyId) : String.Concat("?", ParamKeys.ContentJumpId, "=", tmpReplyId);
994+
}
995+
Response.Redirect(fullURL);
1001996
}
1002997
catch (Exception)
1003998
{

‎Dnn.CommunityForums/themes/community-bootstrap/_src/scss/parts/_action-bars.scss

+7
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@
1313

1414
}
1515
}
16+
17+
// Not for the filter dropdown
18+
.dcf-toolbar-drop-down-menu-content{
19+
.dcf-link-text {
20+
display:inline-block;
21+
}
22+
}
1623

1724
.dcf-actions{
1825
padding: $spacer-md 0;

‎Dnn.CommunityForums/themes/community-bootstrap/theme-source.zip.resources

129 Bytes
Binary file not shown.

‎Dnn.CommunityForums/themes/community-bootstrap/theme.css

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)