Skip to content

Commit

Permalink
Merge pull request #324 from harryPL/rails3
Browse files Browse the repository at this point in the history 
[Rails5] Fix missing parameters in column links
  • Loading branch information
@leikind
leikind authored Aug 29, 2016
2 parents e8a923e + 74ef1e7 commit 0d7348f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions lib/wice/grid_renderer.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ def no_filter_needed_in_main_table? #:nodoc:
end

def base_link_for_filter(controller, extra_parameters = {}) #:nodoc:
new_params = Wice::WgHash.deep_clone controller.params.to_h
new_params = Wice::WgHash.deep_clone controller.params.to_unsafe_h
new_params.merge!(extra_parameters)

if new_params[@grid.name]
Expand All @@ -556,7 +556,7 @@ def base_link_for_filter(controller, extra_parameters = {}) #:nodoc:
end

def link_for_export(controller, format, extra_parameters = {}) #:nodoc:
new_params = Wice::WgHash.deep_clone controller.params.to_h
new_params = Wice::WgHash.deep_clone controller.params.to_unsafe_h
new_params.merge!(extra_parameters)

new_params[@grid.name] = {} unless new_params[@grid.name]
Expand All @@ -578,7 +578,7 @@ def column_link(column, direction, params, extra_parameters = {}) #:nodoc:
ORDER_DIRECTION_PARAMETER_NAME => direction
} }

cleaned_params = Wice::WgHash.deep_clone params.to_h
cleaned_params = Wice::WgHash.deep_clone params.to_unsafe_h
cleaned_params.merge!(extra_parameters)

cleaned_params.delete(:controller)
Expand Down

1 comment on commit 0d7348f

@Dariusch
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello Maintainers =)
This commit is breaking the default behaviour. Its related to #332, concadenating filters.
In our case it was concadenating detached filters, filtering the same filter multiple times.

Regards Dariusch

Please sign in to comment.