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.

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

Fixed issues with migration of HTML content to Content Workflow #6450

Merged
merged 4 commits into from
Mar 24, 2025
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
2 changes: 2 additions & 0 deletions DNN Platform/Modules/HTML/10.00.00.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
' remove old SqlDataProvider
Providers\DataProviders\SqlDataProvider\Upgrade.SqlDataProvider

This file was deleted.

21 changes: 0 additions & 21 deletions DNN Platform/Modules/HTML/Components/DataProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

namespace DotNetNuke.Modules.Html.Components
{
using System;
using System.Data;

/// <summary> The DataProvider is an abstract class that provides the Data Access Layer for the HtmlText module.</summary>
Expand Down Expand Up @@ -79,25 +78,5 @@ public virtual void DeleteHtmlTextUsers()
{
DotNetNuke.Data.DataProvider.Instance().ExecuteNonQuery("DeleteHtmlTextUsers");
}

public virtual IDataReader GetWorkflows(int portalID)
{
return DotNetNuke.Data.DataProvider.Instance().ExecuteReader("GetWorkflows", portalID);
}

public virtual IDataReader GetWorkflowStates(int workflowID)
{
return DotNetNuke.Data.DataProvider.Instance().ExecuteReader("GetWorkflowStates", workflowID);
}

public virtual IDataReader GetWorkflowStatePermissions()
{
return DotNetNuke.Data.DataProvider.Instance().ExecuteReader("GetWorkflowStatePermissions");
}

public virtual IDataReader GetWorkflowStatePermissionsByStateID(int stateID)
{
return DotNetNuke.Data.DataProvider.Instance().ExecuteReader("GetWorkflowStatePermissionsByStateID", stateID);
}
}
}
3 changes: 2 additions & 1 deletion DNN Platform/Modules/HTML/Components/HtmlTextController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ namespace DotNetNuke.Modules.Html
using DotNetNuke.Entities.Content.Taxonomy;
using DotNetNuke.Entities.Content.Workflow;
using DotNetNuke.Entities.Content.Workflow.Entities;
using DotNetNuke.Entities.Content.Workflow.Repositories;
using DotNetNuke.Entities.Modules;
using DotNetNuke.Entities.Portals;
using DotNetNuke.Entities.Tabs;
Expand Down Expand Up @@ -670,7 +671,7 @@ private void CreateUserNotifications(HtmlTextInfo objHtmlText)
if (objHtmlText.StateID != this.workflowManager.GetWorkflow(objHtmlText.WorkflowID).FirstState.StateID && objHtmlText.IsPublished == false)
{
// get users from permissions for state
foreach (WorkflowStatePermissionInfo permission in WorkflowStatePermissionController.GetWorkflowStatePermissions(objHtmlText.StateID))
foreach (var permission in WorkflowStatePermissionsRepository.Instance.GetWorkflowStatePermissionByState(objHtmlText.StateID))
{
if (permission.AllowAccess)
{
Expand Down

This file was deleted.

This file was deleted.

Loading