[myexperiment-hackers] [2539] branches/discovery/app/controllers/application.rb: fixed issue where lock_filter would cause the "remove all filters" link to always show

[noreply]

Revision

2539

Author

dgc

Date

2010-11-26 10:18:43 -0500 (Fri, 26 Nov 2010)

Log Message

fixed issue where lock_filter would cause the "remove all filters" link to always show

Modified Paths

• branches/discovery/app/controllers/application.rb

Diff

Modified: branches/discovery/app/controllers/application.rb (2538 => 2539)

--- branches/discovery/app/controllers/application.rb	2010-11-26 15:13:39 UTC (rev 2538)
+++ branches/discovery/app/controllers/application.rb	2010-11-26 15:18:43 UTC (rev 2539)
@@ -850,6 +850,8 @@
 
     opts[:filters] ||= []
     
+    include_reset_url = opts[:filters].length > 0
+
     # filter out top level logic operators for now
 
     opts[:filters] = opts[:filters].select do |bit|
@@ -970,7 +972,7 @@
       cancel_filter_query_url = build_url(params, opts, opts[:filters], [:filter, :order])
     end
 
-    if opts[:filters].length > 0
+    if include_reset_url
       reset_filters_url = build_url(params, opts, opts[:filters], [:order])
     end