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

Merge branch 'dev' into frederic/fix_1865_api_expose_pj_champ

Browse source
This commit is contained in:
Paul Chavard 2018-04-25 15:30:44 +02:00 • committed by GitHub
commit a5835a9777
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/new_gestionnaire/procedures_controller.rb
View file

@ -237,9 +237,10 @@ module NewGestionnaire
when 'user', 'etablissement', 'entreprise' when 'user', 'etablissement', 'entreprise'
if filter['column'] == 'date_creation' if filter['column'] == 'date_creation'
date = filter['value'].to_date rescue nil
dossiers dossiers
.includes(filter['table']) .includes(filter['table'])
.where("#{filter['table'].pluralize}.#{filter['column']} = ?", filter['value'].to_date) .where("#{filter['table'].pluralize}.#{filter['column']} = ?", date)
else else
dossiers dossiers
.includes(filter['table']) .includes(filter['table'])

4
app/lib/flipflop/strategies/user_preference_strategy.rb
View file

@ -35,8 +35,8 @@ module Flipflop::Strategies
end end
def find_current_administrateur def find_current_administrateur
if request.session["warden.user.user.key"] if request.session["warden.user.administrateur.key"]
administrateur_id = request.session["warden.user.user.key"][0][0] administrateur_id = request.session["warden.user.administrateur.key"][0][0]
Administrateur.find_by(id: administrateur_id) Administrateur.find_by(id: administrateur_id)
end end
end end