fix deleting if and unless options from filters

[Fivell]

I have next code in one of my AA applications which use dynamic filter using if, unless options

Report::CustomCdr::CDR_COLUMNS.each do |key|
      filter Report::CustomData.normalized_column_name(key.to_s).to_sym, :if => proc{
        @custom_cdr.group_by_include? key
      }
  end

It works , but only first time, after reloading page I all filters are on the sidebar like it was no :if . I started to debug and noticed that after first rendering, if and unless options are not used anymore, because they were deleted in active_admin_filters_form_for method.

[seanlinsley]

Are you sure your application was using the latest code on master? Because I'm almost positive that I've fixed this problem before.

[seanlinsley]

Or, @PChambino did: #2523

[coveralls]

Coverage decreased (-0.13%) when pulling 7b07e08 on YETI-switch:fix_filter_options into 5e4fe26 on gregbell:master.

[Fivell]

@seanlinsley , it is almost the same as #2523 , but fix #2523 can't be backported to 0.6.3 and can be used only with rails4 because Array#deep_dup was added in rails4, rails/rails@657b4ff

[seanlinsley]

Array#deep_dup was introduced in Rails 4, but Hash#deep_dup (which is what #2523 uses) is at the very least available in Rails 3.2

[Fivell]

@seanlinsley , if it's Hash then yes it's ok. https://github.com/gregbell/active_admin/blob/master/lib/active_admin/filters/resource_extension.rb#L20 this comment make me thing that it is still array in master.

[Fivell]

@seanlinsley, if you are going to backport both #2523 and ca92329 to 0.6.3 it is ok for me, so we can close this PR

[seanlinsley]

Turns out #2523 can't be backported for 0.6.3 since Hash#deep_dup was first added to Rails 3.1, and we still need to support Rails 3.0. So instead I'm fixing the problem at the source.

[Fivell]

@seanlinsley , I tested it and I can tell that your commit doesn't help.

[Fivell]

@seanlinsley your commit (fa0edec) have next lines

return if opts.key?(:if)     && !call_method_or_proc_on(self, opts[:if])
return if opts.key?(:unless) &&  call_method_or_proc_on(self, opts[:unless])

I belive I mean

next if opts.key?(:if)     && !call_method_or_proc_on(self, opts[:if])
next if opts.key?(:unless) &&  call_method_or_proc_on(self, opts[:unless])

So first failed condition turns off all other filters

[seanlinsley]

Ah... thanks for catching that.

(in which I add tests that try adding more than one filter at a time)

[seanlinsley]

Finally done.