aaf-lipstick 4.0.1 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65aef4573165da6a1a62d6d8c0d02206773bddad
-  data.tar.gz: a87b1cf25fcf9e62ed61894c2b535613a24b72aa
+  metadata.gz: 63367fada9feb5a00858f64daea84e05ffcf76d3
+  data.tar.gz: fce504703c147c2429893b49a4712a08451bf6fe
 SHA512:
-  metadata.gz: 763245f839f4896d8f5377603f82e98442e2ef7fdb79b19b21158d1e739be16649121c6957c4730842f69efba1284d08b983bb6d346df505540707c6fd442f1e
-  data.tar.gz: f5744d6bf50bed44643ab136c3bdf77cbd0c8df8122773582523c31bf6357c21ee1f9f8689665b6730dfd54144386599f0653b4f836a0302e23fba9691e5b3ba
+  metadata.gz: e696653e2a7469e0861978756ab01c746ebad649ecd317e6bfe1c8190f06eb627d30cef87a46304a68f96b792ef28756ebc224bdd2f38871ae205ed93772cb16
+  data.tar.gz: 92d65a0241351ae1bdb4f22b6ee69dcec728ce1bb575183b9aa81e045640be762461a171c2653095a0b7276bba790fa73fe015d37a9090bbd1ae15ebc47e779e

data/lib/lipstick/helpers/pagination_link_renderer.rb

@@ -122,7 +122,7 @@ module Lipstick
         li_opts[:class] = 'active' if page == current
 
         url_opts = template.params.permit(
-          :page, :per_page, :filter, :direction, :sort_by
+          :page, :per_page, :filter, :direction, :sort_by, :state_filter
         ).merge(page: page)
         opts = opts.merge(href: template.url_for(url_opts))
 

data/lib/lipstick/helpers/sortable_helper.rb

@@ -14,14 +14,16 @@ module Lipstick
         if params[:sort_by] == param_name
           sortable_active_link(name, param_name, direction, opposite_direction)
         else
-          link_to name, sort_by: param_name, direction: direction
+          link_to name, request.query_parameters
+                               .merge(sort_by: param_name, direction: direction)
         end
       end
 
       private
 
       def sortable_active_link(name, param_name, direction, opposite_direction)
-        link_to sort_by: param_name, direction: opposite_direction do
+        link_to request.query_parameters.merge(sort_by: param_name,
+                                               direction: opposite_direction) do
           concat("#{name} ")
           concat(
             content_tag('div', class: 'glyphicon') do

data/lib/lipstick/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lipstick
-  VERSION = '4.0.1'
+  VERSION = '4.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aaf-lipstick
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.1.0
 platform: ruby
 authors:
 - Shaun Mangelsdorf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-20 00:00:00.000000000 Z
+date: 2019-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis