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

Fixes for https://github.com/DNNCommunity/Dnn.WebAnalytics/issues/34 and https://github.com/DNNCommunity/Dnn.WebAnalytics/issues/37. #38

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fixes for https://github.com/DNNCommunity/Dnn.WebAnalytics/issues/34 and https://github.com/DNNCommunity/Dnn.WebAnalytics/issues/37. #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9bfe9a5
Update 01.00.00.sql
programatix May 4, 2021
4185d6d
Update Uninstall.sql
programatix May 4, 2021
b625330
Update Dnn.WebAnalytics.dnn
programatix May 4, 2021
a9b4b0d
Update Dnn.WebAnalytics.dnn
programatix May 4, 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
21 changes: 11 additions & 10 deletions Dnn.WebAnalytics.dnn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,16 @@
<helpUrl />
<supportsPopUps>False</supportsPopUps>
</moduleControl>
<moduleControl>
<controlKey>Admin</controlKey>
<controlSrc>DesktopModules/Dnn.WebAnalytics/MapSettings.ascx</controlSrc>
<supportsPartialRendering>True</supportsPartialRendering>
<controlTitle>VisitorsOnline Settings</controlTitle>
<controlType>Admin</controlType>
<iconFile />
<helpUrl />
<supportsPopUps>True</supportsPopUps>
</moduleControl>
</moduleControls>
</moduleDefinition>
</moduleDefinitions>
Expand Down Expand Up @@ -150,15 +160,6 @@
<helpUrl />
<supportsPopUps>False</supportsPopUps>
</moduleControl>
<moduleControl>
<controlKey>Settings</controlKey>
<controlSrc>DesktopModules/Dnn.WebAnalytics/MapSettings.ascx</controlSrc>
<supportsPartialRendering>True</supportsPartialRendering>
<controlTitle>VisitorsOnline Settings</controlTitle>
<controlType>Admin</controlType>
<iconFile />
<helpUrl />
</moduleControl>
</moduleControls>
</moduleDefinition>
</moduleDefinitions>
Expand All @@ -167,4 +168,4 @@
</components>
</package>
</packages>
</dotnetnuke>
</dotnetnuke>
6 changes: 3 additions & 3 deletions Scripts/01.00.00.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ GO
ALTER TABLE {databaseOwner}[{objectQualifier}Visits] CHECK CONSTRAINT [FK_{objectQualifier}Visits_Visitors]
GO

IF EXISTS(SELECT 1 FROM {databaseOwner}[{objectQualifier}Schedule] WHERE [TypeFullName] = N'Dnn.WebAnalyticsLinqToSql.VisitorJob, Dnn.WebAnalyticsLinqToSql')
IF EXISTS(SELECT 1 FROM {databaseOwner}[{objectQualifier}Schedule] WHERE [TypeFullName] = N'Dnn.WebAnalytics.VisitorJob, Dnn.WebAnalytics')
BEGIN
UPDATE {databaseOwner}[{objectQualifier}Schedule]
SET
Expand All @@ -99,12 +99,12 @@ BEGIN
[Servers] = null,
[FriendlyName] = 'Visitor Tracking Job'
WHERE
[TypeFullName] = N'Dnn.WebAnalyticsLinqToSql.VisitorJob, Dnn.WebAnalyticsLinqToSql';
[TypeFullName] = N'Dnn.WebAnalytics.VisitorJob, Dnn.WebAnalytics';
END
ELSE
BEGIN
INSERT INTO {databaseOwner}[{objectQualifier}Schedule]
( [TypeFullName], [TimeLapse], [TimeLapseMeasurement], [RetryTimeLapse], [RetryTimeLapseMeasurement], [RetainHistoryNum], [AttachToEvent], [CatchUpEnabled], [Enabled], [ObjectDependencies], [Servers], [FriendlyName])
VALUES ( 'Dnn.WebAnalyticsLinqToSql.VisitorJob, Dnn.WebAnalyticsLinqToSql', 1, 'd', 1, 'd', 10, '', 0, 1, '', null, 'Visitor Tracking Job' );
VALUES ( 'Dnn.WebAnalytics.VisitorJob, Dnn.WebAnalytics', 1, 'd', 1, 'd', 10, '', 0, 1, '', null, 'Visitor Tracking Job' );
END
GO
4 changes: 2 additions & 2 deletions Scripts/Uninstall.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ IF NOT OBJECT_ID('{databaseOwner}[{objectQualifier}Community_Visitors]') IS NULL
DROP TABLE {databaseOwner}[{objectQualifier}Community_Visitors];
GO

IF EXISTS(SELECT 1 FROM {databaseOwner}[{objectQualifier}Schedule] WHERE [TypeFullName] = N'Dnn.WebAnalyticsLinqToSql.VisitorJob, Dnn.WebAnalyticsLinqToSql')
IF EXISTS(SELECT 1 FROM {databaseOwner}[{objectQualifier}Schedule] WHERE [TypeFullName] = N'Dnn.WebAnalytics.VisitorJob, Dnn.WebAnalytics')
BEGIN
DELETE FROM {databaseOwner}[{objectQualifier}Schedule]
WHERE
[TypeFullName] = N'Dnn.WebAnalyticsLinqToSql.VisitorJob, Dnn.WebAnalyticsLinqToSql';
[TypeFullName] = N'Dnn.WebAnalytics.VisitorJob, Dnn.WebAnalytics';
END