Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue 231 #241

Merged
merged 2 commits into from
May 19, 2022
Merged

Issue 231 #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08d4925
Fixes module setting saving issue, closes #231
KevinSigl Sep 7, 2021
3ca9de5
restore Version set
Sep 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Components/EventModuleSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions EditEvents.ascx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
Loading