blacklight 6.14.0 → 6.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c80294fa4aef88bdf6ec8a3f7690825a05840f77
-  data.tar.gz: fb9bbf2a541804e29c34ad99c0e7eab733647c74
+  metadata.gz: '0781d81bd7e6f463adbda8b8c18ce4e36b1d942e'
+  data.tar.gz: 9eb7e235b9c918d98a464a67970d4ada88d7305f
 SHA512:
-  metadata.gz: 1992d1b06cba55d9e3e1be01cb117631e211567e1a5b2c730d9b52a7a9d4c1229c83035bbe75530cdd1613105e110bd91e6b552a2828c692226eef38e9823c92
-  data.tar.gz: ba9c70f09afc9d98de7ec6340bca9884ca1d4f29980d6ea81c2ae8e2fc1a1a130a4d705902dfb853e5d2a90f0364691a157bd14b33fd0716f3332716e039d876
+  metadata.gz: 712ee1f20420f59b322bcfa87f2fcbde9485e4b592f336cf83a40a6d4c36c3ba35ea40f3eb68b609fb81414729540789c610aa74fd0646425b7f34823bae8ed7
+  data.tar.gz: 75adfcc650cb16ee515d0a6180a0e9de4bfd12d2d85ac4faf22db20dfa21dbd46345da050321eb334428d0511bcf23dd0662ab79aa11e47d6a81a3b2bc7a9c4f

data/VERSION

@@ -1 +1 @@
-6.14.0
+6.14.1

data/app/controllers/concerns/blacklight/catalog.rb

@@ -57,7 +57,8 @@ module Blacklight::Catalog
       search_session['per_page'] = params[:per_page]
 
       if params[:redirect] and (params[:redirect].starts_with?('/') or params[:redirect] =~ URI.regexp)
-        path = URI.parse(params[:redirect]).path
+        uri = URI.parse(params[:redirect])
+        path = uri.query ? "#{uri.path}?#{uri.query}" : uri.path
         redirect_to path, status: 303
       else
         redirect_to blacklight_config.document_model.new(id: params[:id]), status: 303

data/spec/controllers/catalog_controller_spec.rb

@@ -235,6 +235,11 @@ describe CatalogController do
       put :track, params: { id: doc_id, counter: 3, redirect: 'http://localhost:3000/xyz' }
       assert_redirected_to("/xyz")
     end
+
+    it "keeps querystring on redirect" do
+      put :track, params: { id: doc_id, counter: 3, redirect: 'http://localhost:3000/xyz?locale=pt-BR' }
+      assert_redirected_to("/xyz?locale=pt-BR")
+    end
   end
 
   # SHOW ACTION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 6.14.0
+  version: 6.14.1
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-09 00:00:00.000000000 Z
+date: 2018-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails