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

Close Issue 229, error on DNN98x with settings #230

Merged
merged 3 commits into from
Feb 3, 2021
Merged

Close Issue 229, error on DNN98x with settings #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29c8794
Clean old Category and locations preselect records
EPTamminga Jan 17, 2021
c286db7
Further documentation
EPTamminga Jan 17, 2021
0793e8b
Close #229 and create all necessary files for the 707 release
EPTamminga Feb 3, 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
33 changes: 27 additions & 6 deletions Components/EventModuleSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,6 @@ public CategoriesSelected ModuleCategoriesSelected
set { _moduleCategoriesSelected = value; }
}

[ModuleSetting]
public ArrayList ModuleLocationIDs
{
get
Expand All @@ -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;
}
Expand Down
12 changes: 6 additions & 6 deletions Controls/DotNetNuke.Events.ScheduleControl/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)]

Expand All @@ -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")]
[assembly: AssemblyVersion("7.0.7.0")]
[assembly: AssemblyFileVersion("7.0.7.0")]
10 changes: 10 additions & 0 deletions DotNetNuke.Events.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,9 @@
<Content Include="Installation\CleanUp\Cleanup.07.00.02.txt" />
<Content Include="Installation\CleanUp\Cleanup.07.00.03.txt" />
<Content Include="Installation\CleanUp\Cleanup.07.00.04.txt" />
<Content Include="Installation\CleanUp\Cleanup.07.00.05.txt" />
<Content Include="Installation\CleanUp\Cleanup.07.00.06.txt" />
<Content Include="Installation\CleanUp\Cleanup.07.00.07.txt" />
<Content Include="Installation\DNN_Events.png" />
<Content Include="Installation\ReleaseNotes\Release.06.01.05.txt" />
<Content Include="Installation\ReleaseNotes\Release.06.02.00.txt" />
Expand All @@ -397,6 +400,9 @@
<Content Include="Installation\ReleaseNotes\Release.07.00.01.txt" />
<Content Include="Installation\ReleaseNotes\Release.07.00.03.txt" />
<Content Include="Installation\ReleaseNotes\Release.07.00.04.txt" />
<Content Include="Installation\ReleaseNotes\Release.07.00.05.txt" />
<Content Include="Installation\ReleaseNotes\Release.07.00.06.txt" />
<Content Include="Installation\ReleaseNotes\Release.07.00.07.txt" />
<Content Include="Styles\jquery-ui.min.css" />
<Content Include="SubControls\SelectLocation.ascx" />
<Content Include="SubControls\EventIcons.ascx" />
Expand Down Expand Up @@ -581,12 +587,16 @@
<Content Include="Installation\06.02.02.SqlDataProvider" />
<Content Include="Installation\06.03.02.SqlDataProvider" />
<Content Include="Installation\07.00.04.SqlDataProvider" />
<Content Include="Installation\06.02.01.SqlDataProvider" />
<Content Include="Installation\07.00.07.SqlDataProvider" />
<None Include="Installation\Install.05.02.04.SqlDataProvider" />
<None Include="Installation\Project.targets">
<SubType>Designer</SubType>
</None>
<Content Include="Installation\ReleaseNotes\Release.06.03.01.txt" />
<None Include="Installation\Uninstall.SqlDataProvider" />
<Content Include="LICENSE" />
<Content Include="README.md" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="Controls\DotNetNuke.Events.ScheduleControl\DotNetNuke.Events.ScheduleControl.csproj">
Expand Down
29 changes: 29 additions & 0 deletions Installation/07.00.07.SqlDataProvider
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
34 changes: 34 additions & 0 deletions Installation/CleanUp/Cleanup.07.00.07.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
10 changes: 8 additions & 2 deletions Installation/DNN_Events.dnn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DNN_Events" type="Module" version="7.0.6">
<package name="DNN_Events" type="Module" version="7.0.7">
<friendlyName>Events</friendlyName>
<description>This module renders single and recurring events and includes Master and Sub Calendars with Event Rollup, TimeZone Adjustment, Event Enrollment, and Event Notification.</description>
<iconFile>DesktopModules\Events\DNN_Events.png</iconFile>
Expand All @@ -11,7 +11,7 @@
<email>support@dnnsoftware.com</email>
</owner>
<license src="License.txt"></license>
<releaseNotes src="Release.07.00.06.txt"></releaseNotes>
<releaseNotes src="Release.07.00.07.txt"></releaseNotes>
<azureCompatible>true</azureCompatible>
<dependencies>
<dependency type="CoreVersion">8.0.0</dependency>
Expand Down Expand Up @@ -220,6 +220,11 @@
<name>07.00.04.SqlDataProvider</name>
<version>07.00.04</version>
</script>
<script type="Install">
<path>Installation</path>
<name>07.00.07.SqlDataProvider</name>
<version>07.00.07</version>
</script>
<script type="Install">
<path>Installation</path>
<name>Install.05.02.04.SqlDataProvider</name>
Expand Down Expand Up @@ -430,6 +435,7 @@
<component type="Cleanup" version="07.00.04" fileName="Installation\CleanUp\Cleanup.07.00.04.txt" />
<component type="Cleanup" version="07.00.05" fileName="Installation\CleanUp\Cleanup.07.00.05.txt" />
<component type="Cleanup" version="07.00.06" fileName="Installation\CleanUp\Cleanup.07.00.06.txt" />
<component type="Cleanup" version="07.00.07" fileName="Installation\CleanUp\Cleanup.07.00.07.txt" />
<component type="Config">
<config>
<configFile>web.config</configFile>
Expand Down
77 changes: 77 additions & 0 deletions Installation/ReleaseNotes/Release.07.00.07.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<h2>Release notes DNN_Events 07.00.07</h2>
<p>
DNN_Events 07.00.07 will work for any DNN version <strong>8.0.1</strong> and up to the latest release of DNNPlatform. Full details on the changes can be found in great detail at <a href="https://github.com/DNNCommunity/DNN.Events/releases" target="_blank">the repository on GitHub</a>.
</p>
<p>This is a bug fix release of the DNN_Events module.</p>
<p>
<strong>Please note</strong> that you have to reapply the limits on locations in the module settings (if you have used them), because those limitations are removed in the upgrade process.
</p>

<h3>BUG FIXES</h3>
<ul>
<li>Prevent error in Event module settings when upgrading DNN to DNN98x</li>
</ul>
<h3>CHANGES</h3>
<ul>
<li>This upgrade will remove all old Events install packages (no longer needed) that the DNN installer has saved in App_Data folder</li>
</ul>
<p>&nbsp;</p>
<hr />
<p>Below updates since the last main release 07.00.00</p>

<h2>DNN_Events 07.00.06</h2>
<h3>BUG FIXES</h3>
<ul>
<li>Display detail Enrollment box looked empty</li>
</ul>


<h2>DNN_Events 07.00.05</h2>
<h3>BUG FIXES</h3>
<ul>
<li>Several casting errors due to the VB.net/C# conversion fixed</li>
<li>Select date fixed</li>
<li>Auto height in Location & Category table</li>
</ul>

<h2>DNN_Events 07.00.04</h2>
<h3>BUG FIXES</h3>
<ul>
<li>Several casting errors due to the VB.net/C# conversion fixed</li>
<li>Several none functioning buttons and links fixed that were due to the VB.net/C# conversion</li>
<li>Some V6 settings were not carried forward to the new version due to case mismatch in the name of the setting</li>
<li>Select date fixed</li>
<li>Editing event enrolments fixed</li>
<li>Selecting users for enrolment fixed</li>
<li>Approval of enrolments fixed</li>
</ul>
<h3>Other</h3>
<ul>
<li>Code cleanup done</li>
</ul>

<h2>DNN_Events 07.00.03</h2>
<h3>BUG FIXES</h3>
<ul>
<li>Several casting errors due to the VB.net/C# conversion fixed</li>
<li>Several none functioning buttons and links fixed that were due to the VB.net/C# conversion</li>
<li>Some V6 settings were not carried forward to the new version due to case mismatch in the name of the setting</li>
<li>Templates save/update did not work</li>
</ul>

<h2>DNN_Events 07.00.02</h2>
<h3>BUG FIXES</h3>
<ul>
<li>Casting errors due to the VB.net/C# conversion fixed</li>
<li>Fixed an issue where it was impossible to create an event if the edit interval was set to 1440</li>
<li>Fixed an issue where it was impossible to view events after changing months when categories where enabled but none selected</li>
<li>Fixed an issue where it was impossible to view events after changing months when locations where enabled but none selected</li>
<li>Fixed an issue where it was impossible to exit list view mode</li>
</ul>

<h2>DNN_Events 07.00.01</h2>
<h3>BUG FIXES</h3>
<ul>
<li>Casting errors due to the VB.net/C# conversion fixed</li>
<li>URL of image file not saving, solved</li>
</ul>
12 changes: 6 additions & 6 deletions Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
// Review the values of the assembly attributes
[assembly: AssemblyTitle("DotNetNuke.Modules.Events")]
[assembly: AssemblyDescription("Open Source Web Application Framework")]
[assembly: AssemblyCompany("DNN Corp")]
[assembly: AssemblyProduct("http://www.dnnsoftware.com")]
[assembly: AssemblyCopyright("DotNetNuke® is copyright 2002-2018 by DNN Corp. All Rights Reserved.")]
[assembly: AssemblyTrademark("DotNetNuke")]
[assembly: AssemblyCompany("DNNCommunity")]
[assembly: AssemblyProduct("https://dnncommunity.org/")]
[assembly: AssemblyCopyright("DNNCommunity")]
[assembly: AssemblyTrademark("DNNPlatform")]
[assembly: CLSCompliant(true)]
[assembly: ComVisible(false)]

Expand All @@ -29,5 +29,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")]
[assembly: AssemblyVersion("7.0.7.0")]
[assembly: AssemblyFileVersion("7.0.7.0")]