Skip to content

Commit 4ff46d2

Browse files
johnhenleyjohnhenley
authored
Merge pull request #1222 from johnhenley/dev82/release-testing/misc-1
Sorting permission set members causing issues
2 parents 8e44c71 + 94d464d commit 4ff46d2

File tree

5 files changed

+38
-42
lines changed

5 files changed

+38
-42
lines changed

‎Dnn.CommunityForums/Classic.ascx.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ protected override void OnLoad(EventArgs e)
7070
//DotNetNuke.Modules.ActiveForums.Helpers.UpgradeModuleSettings.AddUrlPrefixLikes_080200();
7171
//ForumsConfig.Install_LikeNotificationType_080200();
7272
//ForumsConfig.Install_PinNotificationType_080200();
73-
ForumsConfig.Sort_PermissionSets_080200();
73+
//ForumsConfig.Sort_PermissionSets_080200();
7474
#endif
7575

7676
try

‎Dnn.CommunityForums/Controllers/PermissionController.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -465,6 +465,7 @@ public string SavePermSet(int moduleId, int permissionsId, DotNetNuke.Modules.Ac
465465
var permission = this.GetById(permissionsId, moduleId);
466466
if (permission != null)
467467
{
468+
//permSet = SortPermissionSetMembers(permSet);
468469
SetRolesForRequestedAccess(permission, requestedAccess, permSet);
469470
this.Update(permission);
470471
}
@@ -636,7 +637,6 @@ public static string AddPermToSet(string objectId, int objectType, string permis
636637
{
637638
string newSet = RemovePermFromSet(objectId, objectType, permissionSet);
638639
string[] permSet = newSet.Split('|');
639-
permSet[objectType] += SortPermissionSetMembers(string.Concat(objectId, ";"));
640640
newSet = string.Concat(permSet[0] + "|" + (permSet.Length > 1 ? permSet[1] : string.Empty) + "|" + (permSet.Length > 2 ? permSet[2] : string.Empty), "|");
641641
return newSet;
642642
}

‎Dnn.CommunityForums/Entities/ReplyInfo.cs

+2-6
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,9 @@ namespace DotNetNuke.Modules.ActiveForums.Entities
3737
[TableName("activeforums_Replies")]
3838
[PrimaryKey("ReplyId")]
3939
public partial class ReplyInfo : DotNetNuke.Modules.ActiveForums.Entities.IPostInfo
40-
<<<<<<< HEAD
41-
{
42-
private string cacheKeyTemplate => CacheKeys.ReplyInfo;
43-
=======
4440
{
45-
[IgnoreColumn] private string cacheKeyTemplate => CacheKeys.ReplyInfo;
46-
>>>>>>> dev
41+
[IgnoreColumn]
42+
private string cacheKeyTemplate => CacheKeys.ReplyInfo;
4743
private DotNetNuke.Modules.ActiveForums.Entities.TopicInfo topicInfo;
4844
private DotNetNuke.Modules.ActiveForums.Entities.ContentInfo contentInfo;
4945
private DotNetNuke.Modules.ActiveForums.Entities.AuthorInfo author;

‎Dnn.CommunityForums/class/ForumsConfig.cs

+33-33
Original file line numberDiff line numberDiff line change
@@ -573,23 +573,23 @@ private static string Merge_PermSet_080200(string tempSet)
573573
newRoles += ";";
574574
}
575575

576-
newRoles = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(newRoles);
576+
//newRoles = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(newRoles);
577577

578578
string newUsers = string.Join(";", newAuthUsers);
579579
if (!string.IsNullOrEmpty(newUsers))
580580
{
581581
newUsers += ";";
582582
}
583583

584-
newUsers = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(newUsers);
584+
// newUsers = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(newUsers);
585585

586586
string newGroups = string.Join(";", newAuthGroups);
587587
if (!string.IsNullOrEmpty(newGroups))
588588
{
589589
newGroups += ";";
590590
}
591591

592-
newGroups = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(newGroups);
592+
//newGroups = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(newGroups);
593593

594594
newSet = string.Concat(newRoles, "|", newUsers, "|", newGroups, "|");
595595
}
@@ -810,36 +810,36 @@ internal static void Install_PinNotificationType_080200()
810810
}
811811
}
812812

813-
internal static void Sort_PermissionSets_080200()
814-
{
815-
foreach (var perms in new DotNetNuke.Modules.ActiveForums.Controllers.PermissionController().Get())
816-
{
817-
perms.Announce = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Announce);
818-
perms.Attach = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Attach);
819-
perms.Ban = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Ban);
820-
perms.Block = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Block);
821-
perms.Categorize = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Categorize);
822-
perms.Create = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Create);
823-
perms.Delete = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Delete);
824-
perms.Edit = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Edit);
825-
perms.Lock = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Lock);
826-
perms.Moderate = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Moderate);
827-
perms.Move = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Move);
828-
perms.Pin = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Pin);
829-
perms.Poll = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Poll);
830-
perms.Prioritize = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Prioritize);
831-
perms.Read = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Read);
832-
perms.Reply = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Reply);
833-
perms.Split = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Split);
834-
perms.Subscribe = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Subscribe);
835-
perms.Tag = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Tag);
836-
perms.Trust = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Trust);
837-
perms.View = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.View);
838-
new DotNetNuke.Modules.ActiveForums.Controllers.PermissionController().Update(perms);
839-
840-
}
841-
842-
}
813+
//internal static void Sort_PermissionSets_080200()
814+
//{
815+
// foreach (var perms in new DotNetNuke.Modules.ActiveForums.Controllers.PermissionController().Get())
816+
// {
817+
// perms.Announce = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Announce);
818+
// perms.Attach = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Attach);
819+
// perms.Ban = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Ban);
820+
// perms.Block = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Block);
821+
// perms.Categorize = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Categorize);
822+
// perms.Create = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Create);
823+
// perms.Delete = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Delete);
824+
// perms.Edit = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Edit);
825+
// perms.Lock = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Lock);
826+
// perms.Moderate = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Moderate);
827+
// perms.Move = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Move);
828+
// perms.Pin = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Pin);
829+
// perms.Poll = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Poll);
830+
// perms.Prioritize = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Prioritize);
831+
// perms.Read = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Read);
832+
// perms.Reply = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Reply);
833+
// perms.Split = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Split);
834+
// perms.Subscribe = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Subscribe);
835+
// perms.Tag = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Tag);
836+
// perms.Trust = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.Trust);
837+
// perms.View = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.SortPermissionSetMembers(perms.View);
838+
// new DotNetNuke.Modules.ActiveForums.Controllers.PermissionController().Update(perms);
839+
840+
// }
841+
842+
//}
843843

844844
}
845845
}

‎Dnn.CommunityForums/components/Topics/TopicsController.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ public string UpgradeModule(string Version)
295295
DotNetNuke.Modules.ActiveForums.Helpers.UpgradeModuleSettings.AddUrlPrefixLikes_080200();
296296
ForumsConfig.Install_LikeNotificationType_080200();
297297
ForumsConfig.Install_PinNotificationType_080200();
298-
ForumsConfig.Sort_PermissionSets_080200();
298+
//ForumsConfig.Sort_PermissionSets_080200();
299299
}
300300
catch (Exception ex)
301301
{

0 commit comments

Comments
 (0)