Fixes module setting saving issue, closes DNNCommunity#231

KevinSigl · Sep 7, 2021 · 08d4925 · 08d4925
1 parent ae11df7
commit 08d4925
Show file tree

Hide file tree

Showing 4 changed files with 190 additions and 196 deletions.
diff --git a/Components/EventModuleSettings.cs b/Components/EventModuleSettings.cs
@@ -371,13 +371,13 @@ public ArrayList ModuleCategoryIDs
         [ModuleSetting(ParameterName = "ModuleCategoryIds")]
         public string ModuleCategoryIdsList
         {
-            get { return string.Join(";", ModuleCategoryIDs ?? new ArrayList()); }
+            get => ModuleCategoryIDs == null ? "" : string.Join(";", ModuleCategoryIDs.ToArray());
 
             set
             {
                 ModuleCategoryIDs = !string.IsNullOrWhiteSpace(value)
                                              ? new ArrayList(
-                                                 value.Split(new[] {";"}, StringSplitOptions.RemoveEmptyEntries)
+                                                 value.Split(new[] { ";" }, StringSplitOptions.RemoveEmptyEntries)
                                                       .Select(arg => arg)
                                                       .ToArray())
                                              : new ArrayList();
@@ -429,13 +429,13 @@ public ArrayList ModuleLocationIDs
         [ModuleSetting(ParameterName = "ModuleLocationIds")]
         public string ModuleLocationIdsList
         {
-            get { return string.Join(";", ModuleLocationIDs ?? new ArrayList()); }
+            get => ModuleLocationIDs == null ? "" : string.Join(";", ModuleLocationIDs.ToArray());
 
             set
             {
                 ModuleLocationIDs = !string.IsNullOrWhiteSpace(value)
                     ? new ArrayList(
-                        value.Split(new[] {";"}, StringSplitOptions.RemoveEmptyEntries)
+                        value.Split(new[] { ";" }, StringSplitOptions.RemoveEmptyEntries)
                             .Select(arg => arg)
                             .ToArray())
                     : new ArrayList();

diff --git a/EditEvents.ascx.cs b/EditEvents.ascx.cs
@@ -1190,9 +1190,9 @@ public void LoadNewEventEmailRoles(int roleID)
             {
                 foreach (EventCategoryInfo objCategory in tmpCategories)
                 {
-                    foreach (int moduleCategory in Settings.ModuleCategoryIDs)
+                    foreach (object moduleCategory in Settings.ModuleCategoryIDs)
                     {
-                        if (moduleCategory == objCategory.Category)
+                        if (Convert.ToInt32(moduleCategory) == objCategory.Category)
                         {
                             objCategories.Add(objCategory);
                         }