Update Workflow Type (#15953)

OrchardCMS · May 3, 2024 · dc70203 · dc70203
1 parent 17019c4
commit dc70203
Showing 1 changed file with 3 additions and 11 deletions.
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Controllers/WorkflowTypeController.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Controllers/WorkflowTypeController.cs
@@ -101,13 +101,6 @@ public async Task<IActionResult> Index(WorkflowTypeIndexOptions options, PagerPa
 
             var query = _session.Query<WorkflowType, WorkflowTypeIndex>();
 
-            switch (options.Filter)
-            {
-                case WorkflowTypeFilter.All:
-                default:
-                    break;
-            }
-
             if (!string.IsNullOrWhiteSpace(options.Search))
             {
                 query = query.Where(x => x.Name.Contains(options.Search));
@@ -127,17 +120,16 @@ public async Task<IActionResult> Index(WorkflowTypeIndexOptions options, PagerPa
                 .Take(pager.PageSize)
                 .ListAsync();
 
-            // The existing session's connection is returned, don't dispose it
-            var connection = await _session.CreateConnectionAsync();
-
             var dialect = _session.Store.Configuration.SqlDialect;
             var sqlBuilder = dialect.CreateBuilder(_session.Store.Configuration.TablePrefix);
             sqlBuilder.Select();
             sqlBuilder.Distinct();
             sqlBuilder.Selector(nameof(WorkflowIndex), nameof(WorkflowIndex.WorkflowTypeId), _session.Store.Configuration.Schema);
             sqlBuilder.Table(nameof(WorkflowIndex), alias: null, _session.Store.Configuration.Schema);
 
-            var workflowTypeIdsWithInstances = await connection.QueryAsync<string>(sqlBuilder.ToSqlString());
+            // Use existing session connection. Do not use 'using' or dispose the connection.
+            var connection = await _session.CreateConnectionAsync();
+            var workflowTypeIdsWithInstances = (await connection.QueryAsync<string>(sqlBuilder.ToSqlString(), param: null, _session.CurrentTransaction)).ToList();
 
             // Maintain previous route data when generating page links.
             var routeData = new RouteData();