diff --git a/Components/EventModuleSettings.cs b/Components/EventModuleSettings.cs
index fd77b04..ea9f892 100644
--- a/Components/EventModuleSettings.cs
+++ b/Components/EventModuleSettings.cs
@@ -411,7 +411,6 @@ public CategoriesSelected ModuleCategoriesSelected
set { _moduleCategoriesSelected = value; }
}
- [ModuleSetting]
public ArrayList ModuleLocationIDs
{
get
@@ -427,21 +426,43 @@ public ArrayList ModuleLocationIDs
set { _moduleLocationIDs = value; }
}
+ [ModuleSetting(ParameterName = "ModuleLocationIds")]
+ public string ModuleLocationIdsList
+ {
+ get { return string.Join(";", ModuleLocationIDs ?? new ArrayList()); }
+
+ set
+ {
+ ModuleLocationIDs = !string.IsNullOrWhiteSpace(value)
+ ? new ArrayList(
+ value.Split(new[] {";"}, StringSplitOptions.RemoveEmptyEntries)
+ .Select(arg => arg)
+ .ToArray())
+ : new ArrayList();
+ }
+ }
+
+
public LocationsSelected ModuleLocationsSelected
{
get
{
+ int moduleLocAll = 0;
if (ModuleLocationIDs.Count == 0)
{
_moduleLocationsSelected = LocationsSelected.None;
}
- else if (Convert.ToInt32(ModuleLocationIDs[0]) == -1)
- {
- _moduleLocationsSelected = LocationsSelected.All;
- }
else
{
- _moduleLocationsSelected = LocationsSelected.Some;
+ moduleLocAll = int.TryParse(ModuleLocationIDs[0] as string, out moduleLocAll) ? moduleLocAll : -1;
+ if (moduleLocAll == -1)
+ {
+ _moduleLocationsSelected = LocationsSelected.All;
+ }
+ else
+ {
+ _moduleLocationsSelected = LocationsSelected.Some;
+ }
}
return _moduleLocationsSelected;
}
diff --git a/Controls/DotNetNuke.Events.ScheduleControl/Properties/AssemblyInfo.cs b/Controls/DotNetNuke.Events.ScheduleControl/Properties/AssemblyInfo.cs
index 064bda9..be8d64a 100644
--- a/Controls/DotNetNuke.Events.ScheduleControl/Properties/AssemblyInfo.cs
+++ b/Controls/DotNetNuke.Events.ScheduleControl/Properties/AssemblyInfo.cs
@@ -11,10 +11,10 @@
[assembly: AssemblyTitle("DotNetNuke.Modules.Events")]
[assembly: AssemblyDescription("Open Source Web Application Framework")]
-[assembly: AssemblyCompany("DNNCorp")]
-[assembly: AssemblyProduct("http://www.dnnsoftware.com")]
-[assembly: AssemblyCopyright("DotNetNuke® is copyright 2002-2018 by DNNCorp. All Rights Reserved.")]
-[assembly: AssemblyTrademark("DotNetNuke")]
+[assembly: AssemblyCompany("DNNCommunity.org")]
+[assembly: AssemblyProduct("https://dnncommunity.com")]
+[assembly: AssemblyCopyright("DMMCommunity")]
+[assembly: AssemblyTrademark("DNNPlatform")]
[assembly: ComVisible(false)]
@@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("7.0.6.0")]
-[assembly: AssemblyFileVersion("7.0.6.0")]
\ No newline at end of file
+[assembly: AssemblyVersion("7.0.7.0")]
+[assembly: AssemblyFileVersion("7.0.7.0")]
\ No newline at end of file
diff --git a/DotNetNuke.Events.csproj b/DotNetNuke.Events.csproj
index 4cf2ee3..9127ce9 100644
--- a/DotNetNuke.Events.csproj
+++ b/DotNetNuke.Events.csproj
@@ -373,6 +373,9 @@
+
+
+
@@ -397,6 +400,9 @@
+
+
+
@@ -581,12 +587,16 @@
+
+
Designer
+
+
diff --git a/Installation/07.00.07.SqlDataProvider b/Installation/07.00.07.SqlDataProvider
new file mode 100644
index 0000000..8190e4d
--- /dev/null
+++ b/Installation/07.00.07.SqlDataProvider
@@ -0,0 +1,29 @@
+/************************************************************/
+/***** *****/
+/***** SqlDataProvider *****/
+/***** Install/Upgrade for Events module 07.00.07 *****/
+/***** *****/
+/***** Note: To manually execute this script you must *****/
+/***** perform a search AND replace operation *****/
+/***** for {databaseOwner} AND {objectQualifier} *****/
+/***** or use 'SQL' FROM Host Menu AND run this. *****/
+/***** *****/
+/************************************************************/
+
+
+/* Remove the Module limits for category and/or locations per module instance */
+
+DELETE FROM {databaseOwner}[{objectQualifier}ModuleSettings]
+WHERE ModuleID IN
+ (
+ SELECT DISTINCT MS.ModuleID
+ FROM {databaseOwner}[{objectQualifier}ModuleSettings] AS MS
+ INNER JOIN {databaseOwner}[{objectQualifier}Modules] AS MO
+ ON MO.ModuleID = MS.[ModuleID]
+ INNER JOIN {databaseOwner}[{objectQualifier}ModuleDefinitions] AS MD
+ ON MD.ModuleDefID = MO.ModuleDefID
+ WHERE MD.DefinitionName = 'Events'
+ )
+ AND [ModuleSettings].SettingName = 'ModuleLocationIds';
+
+GO
diff --git a/Installation/CleanUp/Cleanup.07.00.07.txt b/Installation/CleanUp/Cleanup.07.00.07.txt
new file mode 100644
index 0000000..861cb01
--- /dev/null
+++ b/Installation/CleanUp/Cleanup.07.00.07.txt
@@ -0,0 +1,34 @@
+'Remove old versions of events
+Install\Module\Events_07.00.06_Install.zip
+
+'Remove the old install packages that are saved by the DNN installer
+App_Data\ExtensionPackages\Module_DNN_Events_5.1.5.resources
+App_Data\ExtensionPackages\Module_DNN_Events_5.2.3.resources
+App_Data\ExtensionPackages\Module_DNN_Events_6.0.0.resources
+App_Data\ExtensionPackages\Module_DNN_Events_6.0.1.resources
+App_Data\ExtensionPackages\Module_DNN_Events_6.0.2.resources
+App_Data\ExtensionPackages\Module_DNN_Events_6.0.3.resources
+App_Data\ExtensionPackages\Module_DNN_Events_6.0.4.resources
+App_Data\ExtensionPackages\Module_DNN_Events_6.1.0.resources
+App_Data\ExtensionPackages\Module_DNN_Events_6.1.1.resources
+App_Data\ExtensionPackages\Module_DNN_Events_6.1.2.resources
+App_Data\ExtensionPackages\Module_DNN_Events_6.1.3.resources
+App_Data\ExtensionPackages\Module_DNN_Events_6.1.4.resources
+App_Data\ExtensionPackages\Module_DNN_Events_6.1.5.resources
+App_Data\ExtensionPackages\Module_DNN_Events_6.2.0.resources
+App_Data\ExtensionPackages\Module_DNN_Events_6.2.1.resources
+App_Data\ExtensionPackages\Module_DNN_Events_6.2.2.resources
+App_Data\ExtensionPackages\Module_DNN_Events_6.3.0.resources
+App_Data\ExtensionPackages\Module_DNN_Events_6.3.1.resources
+App_Data\ExtensionPackages\Module_DNN_Events_7.0.0.resources
+App_Data\ExtensionPackages\Module_DNN_Events_7.0.1.resources
+App_Data\ExtensionPackages\Module_DNN_Events_7.0.2.resources
+App_Data\ExtensionPackages\Module_DNN_Events_7.0.3.resources
+App_Data\ExtensionPackages\Module_DNN_Events_7.0.4.resources
+App_Data\ExtensionPackages\Module_DNN_Events_7.0.5.resources
+App_Data\ExtensionPackages\Module_DNN_Events_7.0.6.resources
+
+
+'Tidy up debug files if any
+Bin\DotNetNuke.Modules.Events.pdb
+Bin\DotNetNuke.Modules.Events.ScheduleControl.pdb
diff --git a/Installation/DNN_Events.dnn b/Installation/DNN_Events.dnn
index d3fb6bb..1a9bf76 100644
--- a/Installation/DNN_Events.dnn
+++ b/Installation/DNN_Events.dnn
@@ -1,6 +1,6 @@
-
+
Events
This module renders single and recurring events and includes Master and Sub Calendars with Event Rollup, TimeZone Adjustment, Event Enrollment, and Event Notification.
DesktopModules\Events\DNN_Events.png
@@ -11,7 +11,7 @@
support@dnnsoftware.com
-
+
true
8.0.0
@@ -220,6 +220,11 @@
07.00.04.SqlDataProvider
07.00.04
+