Merge remote-tracking branch 'origin/master' into gs-master

2017-11-16 22:52:37 -06:00
parent ee560abdbe dc6e031364
commit b28b405b97
29 changed files with 136 additions and 72 deletions
--- a/app/helpers/admin/filter_helper.rb
+++ b/app/helpers/admin/filter_helper.rb
@ -18,7 +18,7 @@ module Admin::FilterHelper

  def selected?(more_params)
    new_url = filtered_url_for(more_params)
-    filter_link_class(new_url) == 'selected' ? true : false
+    filter_link_class(new_url) == 'selected'
  end

  private