DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Fix administrate pagination by pinning to an old version of kaminari

Browse source
This commit is contained in:
Paul Chavard 2020-03-05 12:57:28 +01:00
parent 15e25b0c3e
commit e540dea929
3 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -41,7 +41,7 @@ gem 'groupdate'
gem 'haml-rails' gem 'haml-rails'
gem 'hashie' gem 'hashie'
gem 'jquery-rails' # Use jquery as the JavaScript library gem 'jquery-rails' # Use jquery as the JavaScript library
gem 'kaminari' # Pagination gem 'kaminari', '= 1.1.1' # Pagination
gem 'lograge' gem 'lograge'
gem 'logstash-event' gem 'logstash-event'
gem 'mailjet' gem 'mailjet'

22
Gemfile.lock
View file

@ -325,18 +325,18 @@ GEM
bindata bindata
jsonapi-renderer (0.2.2) jsonapi-renderer (0.2.2)
jwt (2.1.0) jwt (2.1.0)
kaminari (1.2.0) kaminari (1.1.1)
activesupport (>= 4.1.0) activesupport (>= 4.1.0)
kaminari-actionview (= 1.2.0) kaminari-actionview (= 1.1.1)
kaminari-activerecord (= 1.2.0) kaminari-activerecord (= 1.1.1)
kaminari-core (= 1.2.0) kaminari-core (= 1.1.1)
kaminari-actionview (1.2.0) kaminari-actionview (1.1.1)
actionview actionview
kaminari-core (= 1.2.0) kaminari-core (= 1.1.1)
kaminari-activerecord (1.2.0) kaminari-activerecord (1.1.1)
activerecord activerecord
kaminari-core (= 1.2.0) kaminari-core (= 1.1.1)
kaminari-core (1.2.0) kaminari-core (1.1.1)
launchy (2.4.3) launchy (2.4.3)
addressable (~> 2.3) addressable (~> 2.3)
letter_opener (1.7.0) letter_opener (1.7.0)
@ -384,7 +384,7 @@ GEM
nenv (0.3.0) nenv (0.3.0)
netrc (0.11.0) netrc (0.11.0)
nio4r (2.5.2) nio4r (2.5.2)
nokogiri (1.10.8) nokogiri (1.10.9)
mini_portile2 (~> 2.4.0) mini_portile2 (~> 2.4.0)
notiffany (0.1.1) notiffany (0.1.1)
nenv (~> 0.1) nenv (~> 0.1)
@ -766,7 +766,7 @@ DEPENDENCIES
haml-rails haml-rails
hashie hashie
jquery-rails jquery-rails
kaminari kaminari (= 1.1.1)
launchy launchy
letter_opener_web letter_opener_web
lograge lograge

16
spec/controllers/manager/procedures_controller_spec.rb
View file

@ -25,4 +25,20 @@ describe Manager::ProceduresController, type: :controller do
it { expect(response.body).to include('sub type de champ') } it { expect(response.body).to include('sub type de champ') }
end end
describe '#index' do
render_views
let(:administration) { create(:administration) }
let!(:dossier) { create(:dossier) }
context 'sort by dossiers' do
before do
sign_in(administration)
get :index, params: { procedure: { direction: 'asc', order: 'dossiers' } }
end
it { expect(response.body).to include('1 dossier') }
end
end
end end