Merge branch 'version-2' of github.com:bogdan/datagrid into version-2

bogdan · Nov 16, 2024 · 3fb0aa1 · 3fb0aa1
2 parents 757fd56 + f30a9bb
commit 3fb0aa1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/views/datagrid/_row.html.erb b/app/views/datagrid/_row.html.erb
@@ -6,7 +6,7 @@
         # Adding html clases based on condition
         # Consider maintaining consistency with datagrid/head partial
         "datagrid-order-active-asc": grid.ordered_by?(column, false),
-        "datagrid-order-active-desc": grid.ordered_by?(column ,true),
+        "datagrid-order-active-desc": grid.ordered_by?(column, true),
         column.html_class => column.html_class.present?,
       },
       "data-column": column.name

diff --git a/lib/datagrid/core.rb b/lib/datagrid/core.rb
@@ -273,7 +273,7 @@ def sanitize_for_mass_assignment(attributes)
       if forbidden_attributes_protection
         super
       elsif defined?(ActionController::Parameters) && attributes.is_a?(ActionController::Parameters)
-        attributes.permit!.to_h
+        attributes.to_unsafe_h
       else
         attributes
       end

diff --git a/version-2/views.diff b/version-2/views.diff
@@ -103,7 +103,7 @@ index f54d21c..f57c729 100644
 +        # Adding html clases based on condition
 +        # Consider maintaining consistency with datagrid/head partial
 +        "datagrid-order-active-asc": grid.ordered_by?(column, false),
-+        "datagrid-order-active-desc": grid.ordered_by?(column ,true),
++        "datagrid-order-active-desc": grid.ordered_by?(column, true),
 +        column.html_class => column.html_class.present?,
 +      },
 +      "data-column": column.name