bulk action filter fix for modal (#48)

Author: dalenewman

CHANGELOG.md

@@ -1,3 +1,12 @@
+# 0.17.3 <small>2026-04-02</small>
+
+## 🐞 Bug Fixes
+- Respect report filter when selecting all records and using modal bulk actions
+- Don't add dragging to report headers unless edit mode is enabled
+
+<!-- CHANGELOG_BOUNDARY -->
+
+
 # 0.17.2 <small>2026-03-30</small>
 
 ## 🚀 Features

src/OrchardCore.BootswatchTheme.Settings/OrchardCore.BootswatchTheme.Settings.csproj

@@ -5,9 +5,9 @@
       <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
       <Nullable>enable</Nullable>
       <ImplicitUsings>enable</ImplicitUsings>
-      <Version>0.17.2</Version>
-      <FileVersion>0.17.2</FileVersion>
-      <AssemblyVersion>0.17.2</AssemblyVersion>
+      <Version>0.17.3</Version>
+      <FileVersion>0.17.3</FileVersion>
+      <AssemblyVersion>0.17.3</AssemblyVersion>
    </PropertyGroup>
 
    <ItemGroup>

src/OrchardCore.BootswatchTheme/OrchardCore.BootswatchTheme.csproj

@@ -5,10 +5,10 @@
       <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
       <Nullable>enable</Nullable>
       <ImplicitUsings>enable</ImplicitUsings>
-      <Version>0.17.2</Version>
+      <Version>0.17.3</Version>
       <AssemblyName>BootswatchTheme</AssemblyName>
-      <FileVersion>0.17.2</FileVersion>
-      <AssemblyVersion>0.17.2</AssemblyVersion>
+      <FileVersion>0.17.3</FileVersion>
+      <AssemblyVersion>0.17.3</AssemblyVersion>
    </PropertyGroup>
 
    <ItemGroup>

src/OrchardCore.Proxy/OrchardCore.Proxy.csproj

@@ -4,9 +4,9 @@
       <TargetFramework>net8.0</TargetFramework>
       <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
       <RootNamespace>ProxyModule</RootNamespace>
-      <Version>0.17.2</Version>
-      <FileVersion>0.17.2</FileVersion>
-      <AssemblyVersion>0.17.2</AssemblyVersion>
+      <Version>0.17.3</Version>
+      <FileVersion>0.17.3</FileVersion>
+      <AssemblyVersion>0.17.3</AssemblyVersion>
       <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
       <Authors>Dale Newman</Authors>
       <Copyright>Copyright © 2023-2026</Copyright>

src/OrchardCore.Transformalize/OrchardCore.Transformalize.csproj

@@ -3,9 +3,9 @@
       <TargetFramework>net8.0</TargetFramework>
       <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
       <RootNamespace>TransformalizeModule</RootNamespace>
-      <Version>0.17.2</Version>
-      <FileVersion>0.17.2</FileVersion>
-      <AssemblyVersion>0.17.2</AssemblyVersion>
+      <Version>0.17.3</Version>
+      <FileVersion>0.17.3</FileVersion>
+      <AssemblyVersion>0.17.3</AssemblyVersion>
       <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
       <Authors>Dale Newman</Authors>
       <Copyright>Copyright © 2013-2026</Copyright>

src/OrchardCore.Transformalize/Views/Report/Index.cshtml

@@ -203,7 +203,7 @@
                            </th>
                         }
                         @foreach (var field in fields) {
-                           <th title="@field.Name" class="@(field.IsCalculated ? string.Empty : "drag")" data-src="@field.Src">@field.Label</th>
+                           <th title="@field.Name" class="@(edit && !field.IsCalculated ? "drag" : string.Empty)" data-src="@field.Src">@field.Label</th>
                         }
                      </tr>
                      @if (isSortable) {
@@ -382,6 +382,7 @@
 
    var server = {
       mode: "report",
+      edit: @(edit ? "true" : "false"),
       entity: {
          page: @firstEntity.Page
       },

src/OrchardCore.Transformalize/wwwroot/Scripts/report.js

@@ -134,6 +134,21 @@ function bulkAction(page, name, modal) {
             $tempForm.append($('<input type="hidden" name="' + this.name + '" />').val(this.value));
          });
 
+         /* preserve filter for bulk action in modal when "select all" is checked */
+         if ($('#select-all').is(':checked')) {
+            $('#id_report').find('input[type="hidden"], input[type="text"]').each(function () {
+               if (this.name) {
+                  $tempForm.append($('<input type="hidden" />').attr('name', this.name).val(this.value));
+               }
+            });
+            $('#id_report select').each(function () {
+               var name = this.name;
+               $(this).find('option:selected').each(function () {
+                  $tempForm.append($('<input type="hidden" />').attr('name', name).val(this.value));
+               });
+            });
+         }
+
          $('body').append($tempForm);
 
          $('#taskModal').modal({
@@ -526,7 +541,7 @@ $(document).ready(function () {
       }
    });
 
-   if (server.mode === "report") {
+   if (server.mode === "report" && server.edit) {
       $("table:first").dragtable({
          dragaccept: '.drag',
          persistState: function (_table) {

src/Site/Site.csproj

@@ -7,9 +7,9 @@
       <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
       <DockerfileContext>..\..</DockerfileContext>
       <DockerfileTag>transformalize.orchard</DockerfileTag>
-      <Version>0.17.2</Version>
-      <FileVersion>0.17.2</FileVersion>
-      <AssemblyVersion>0.17.2</AssemblyVersion>
+      <Version>0.17.3</Version>
+      <FileVersion>0.17.3</FileVersion>
+      <AssemblyVersion>0.17.3</AssemblyVersion>
       <ReleaseVersion>0.17.0</ReleaseVersion>      
       <RazorRuntimeCompilation>true</RazorRuntimeCompilation>
       <CopyRefAssembliesToPublishDirectory>true</CopyRefAssembliesToPublishDirectory>

test/OrchardCore.Transformalize.Tests/OrchardCore.Transformalize.Tests.csproj

@@ -7,9 +7,9 @@
 
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
-    <Version>0.17.2</Version>
-    <FileVersion>0.17.2</FileVersion>
-    <AssemblyVersion>0.17.2</AssemblyVersion>
+    <Version>0.17.3</Version>
+    <FileVersion>0.17.3</FileVersion>
+    <AssemblyVersion>0.17.3</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>