Skip to content

Commit

Permalink
Merge pull request #967 from DNNCommunity/dev
Browse files Browse the repository at this point in the history 
Sync master and dev
  • Loading branch information
@WillStrohl
WillStrohl authored Jul 3, 2024
2 parents 403a180 + 31e1715 commit 1b168a4
Show file tree
Hide file tree
Showing 16 changed files with 74 additions and 48 deletions.
10 changes: 5 additions & 5 deletions Dnn.CommunityForums/Controllers/ForumController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,6 @@ public XmlDocument GetForumListXML(int PortalId, int ModuleId)
}
public int Forums_Save(int portalId, DotNetNuke.Modules.ActiveForums.Entities.ForumInfo fi, bool isNew, bool useGroupFeatures, bool useGroupSecurity)
{
var permissionsId = -1;
var fg = new DotNetNuke.Modules.ActiveForums.Controllers.ForumGroupController().GetById(fi.ForumGroupId, fi.ModuleId);
if (useGroupSecurity)
{
Expand All @@ -288,10 +287,11 @@ public int Forums_Save(int portalId, DotNetNuke.Modules.ActiveForums.Entities.Fo
}
else
{
fi.PermissionsId = new DotNetNuke.Modules.ActiveForums.Controllers.PermissionController().CreateAdminPermissions(DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.GetAdministratorsRoleId(portalId).ToString()).PermissionsId;
DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.CreateDefaultSets(portalId, fi.PermissionsId);
permissionsId = fi.PermissionsId;
isNew = true;
if (isNew || (fi?.PermissionsId == fg?.PermissionsId)) /* new forum or switching from group security to forum security */
{
fi.PermissionsId = new DotNetNuke.Modules.ActiveForums.Controllers.PermissionController().CreateAdminPermissions(DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.GetAdministratorsRoleId(portalId).ToString()).PermissionsId;
DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.CreateDefaultSets(portalId, fi.PermissionsId);
}
}
fi.ForumSettingsKey = useGroupFeatures ? (fg != null ? fg.GroupSettingsKey : string.Empty) : (fi.ForumID > 0 ? $"F:{fi.ForumID}" : string.Empty);

Expand Down
10 changes: 5 additions & 5 deletions Dnn.CommunityForums/DnnCommunityForums.dnn
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="Active Forums" type="Module" version="08.01.01">
<package name="Active Forums" type="Module" version="08.01.02">
<friendlyName>DNN Community Forums</friendlyName>
<description>DNN Community Forums: The official online forums module for the DNN Community.</description>
<iconFile>DesktopModules/ActiveForums/images/branding/logo/DNN-Community-Forums-Icon-64px.png</iconFile>
Expand Down Expand Up @@ -86,7 +86,7 @@
<assembly>
<name>DotNetNuke.Modules.ActiveForums.dll</name>
<sourceFileName>bin\DotNetNuke.Modules.ActiveForums.dll</sourceFileName>
<version>08.01.01</version>
<version>08.01.02</version>
</assembly>
</assemblies>
</component>
Expand Down Expand Up @@ -392,7 +392,7 @@
<script type="UnInstall">
<path>sql</path>
<name>Uninstall.SqlDataProvider</name>
<version>08.01.01</version>
<version>08.01.02</version>
</script>
</scripts>
</component>
Expand Down Expand Up @@ -433,7 +433,7 @@
</components>
</package>

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

<friendlyName>DNN Community Forums What's New</friendlyName>
<foldername>ActiveForumsWhatsNew</foldername>
Expand Down Expand Up @@ -503,7 +503,7 @@
</components>
</package>

<package name="Active Forums Viewer" type="Module" version="08.01.01">
<package name="Active Forums Viewer" type="Module" version="08.01.02">
<friendlyName>DNN Community Forums Forums Viewer</friendlyName>
<foldername>ActiveForumsViewer</foldername>
<description>DNN Community Forums: Display any forum topic view on any page within your site.</description>
Expand Down
6 changes: 2 additions & 4 deletions Dnn.CommunityForums/DnnCommunityForums_Symbols.dnn
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="Active Forums_Symbols" type="Library" version="08.01.01">
<package name="Active Forums_Symbols" type="Library" version="08.01.02">

<friendlyName>DNN Community Forums Symbols</friendlyName>
<description>DNN Community Forums: The official online forums module for the DNN Community.</description>
Expand All @@ -15,9 +15,7 @@
<releaseNotes src="ReleaseNotes.txt" />
<azureCompatible>True</azureCompatible>
<dependencies>

<dependency type="managedPackage" version="8.1.1">Active Forums</dependency>

<dependency type="managedPackage" version="8.1.2">Active Forums</dependency>
</dependencies>
<components>
<component type="ResourceFile">
Expand Down
4 changes: 2 additions & 2 deletions Dnn.CommunityForums/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:

[assembly: AssemblyVersion("08.01.01")]
[assembly: AssemblyVersion("08.01.02")]

[assembly: AssemblyFileVersion("08.01.01")]
[assembly: AssemblyFileVersion("08.01.02")]


[assembly: WebResource("DotNetNuke.Modules.ActiveForums.CustomControls.Resources.cb.js", "text/javascript")]
Expand Down
37 changes: 24 additions & 13 deletions Dnn.CommunityForums/ReleaseNotes.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,18 +96,29 @@
<div class="dnnClear">
<h2>Release Notes</h2>
<hr />
<h3>08.01.01<!-- <span class="muy-importante">RELEASE CANDIDATE 1</span>--></h3>
<h3>08.01.02</h3>

<!--
<p class="muy-importante">
<strong>IMPORTANT!!!</strong> This is a release candidate (RC). Please <strong>DO NOT</strong> use this installation/upgrade package for any production
websites of any kind.
</p>
<h4>New Features &amp; Enhancements</h4>
<ul>
<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>
<!--<li>UPDATE: (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/">Issue </a>, thanks <a href="https://github.com/" target="_blank">@</a>!)</li>-->
</ul>

<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
their websites first, before we deploy an official release.
</p>
-->
<h4>Bug Fixes</h4>
<ul>
<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>
<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>
<!--<li>FIXED: (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/">Issue </a>, thanks <a href="https://github.com/" target="_blank">@</a>!)</li>-->
</ul>

<h4>Tasks / Development Updates (and Technical Debt)</h4>
<ul>
<li>None at this time.</li>
<!--<li>TASK: (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/">Issue </a>, thanks <a href="https://github.com/" target="_blank">@</a>!)</li>-->
</ul>
<hr />

<h3>08.01.01</h3>

<h4>New Features &amp; Enhancements</h4>
<ul>
Expand All @@ -117,7 +128,7 @@
<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>
<!--<li>UPDATE: (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/">Issue </a>, thanks <a href="https://github.com/" target="_blank">@</a>!)</li>-->
</ul>

<h4>Bug Fixes</h4>
<ul>
<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>
Expand All @@ -127,13 +138,13 @@
<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>
<!--<li>FIXED: (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/">Issue </a>, thanks <a href="https://github.com/" target="_blank">@</a>!)</li>-->
</ul>

<h4>Tasks / Development Updates (and Technical Debt)</h4>
<ul>
<li>None at this time.</li>
<!--<li>TASK: (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/">Issue </a>, thanks <a href="https://github.com/" target="_blank">@</a>!)</li>-->
</ul>
<hr />
<hr />

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

Expand Down
25 changes: 10 additions & 15 deletions Dnn.CommunityForums/controls/af_post.ascx.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -982,22 +982,17 @@ private void SaveReply()
if (!_isEdit)
{
DotNetNuke.Modules.ActiveForums.Controllers.ReplyController.QueueApprovedReplyAfterAction(PortalId, TabId, ModuleId, _fi.ForumGroupId, ForumId, TopicId, tmpReplyId, ri.Content.AuthorId);

var ctlUtils = new ControlUtils();
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);

if (fullURL.Contains("~/"))
{
fullURL = Utilities.NavigateURL(TabId, "", new[] { ParamKeys.TopicId + "=" + TopicId, ParamKeys.ContentJumpId + "=" + tmpReplyId });
}
if (fullURL.EndsWith("/"))
{
fullURL += Utilities.UseFriendlyURLs(ForumModuleId) ? String.Concat("#", tmpReplyId) : String.Concat("?", ParamKeys.ContentJumpId, "=", tmpReplyId);
}
if (!_isEdit)

Response.Redirect(fullURL);
}
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);
if (fullURL.Contains("~/"))
{
fullURL = Utilities.NavigateURL(TabId, "", new[] { ParamKeys.TopicId + "=" + TopicId, ParamKeys.ContentJumpId + "=" + tmpReplyId });
}
if (fullURL.EndsWith("/"))
{
fullURL += Utilities.UseFriendlyURLs(ForumModuleId) ? String.Concat("#", tmpReplyId) : String.Concat("?", ParamKeys.ContentJumpId, "=", tmpReplyId);
}
Response.Redirect(fullURL);
}
catch (Exception)
{
Expand Down
7 changes: 7 additions & 0 deletions Dnn.CommunityForums/themes/community-bootstrap/_src/scss/parts/_action-bars.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@

}
}

// Not for the filter dropdown
.dcf-toolbar-drop-down-menu-content{
.dcf-link-text {
display:inline-block;
}
}

.dcf-actions{
padding: $spacer-md 0;
Expand Down
Binary file modified Dnn.CommunityForums/themes/community-bootstrap/theme-source.zip.resources
View file
Binary file not shown.
3 changes: 3 additions & 0 deletions Dnn.CommunityForums/themes/community-bootstrap/theme.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 1b168a4

Please sign in to comment.