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

Merge pull request #639 from sgmap/n_plus_one_hunt

Browse source 
N plus one hunt
This commit is contained in:
Mathieu Magnin 2017-08-25 11:10:29 +02:00
commit f15093ac35
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -27,19 +27,26 @@ module NewGestionnaire
@a_suivre_dossiers = procedure @a_suivre_dossiers = procedure
.dossiers .dossiers
.includes(:user)
.without_followers .without_followers
.en_cours .en_cours
@followed_dossiers = current_gestionnaire @followed_dossiers = current_gestionnaire
.followed_dossiers .followed_dossiers
.includes(:user)
.where(procedure: @procedure) .where(procedure: @procedure)
.en_cours .en_cours
@termines_dossiers = procedure.dossiers.termine @followed_dossiers_id = current_gestionnaire
.followed_dossiers
.where(procedure: @procedure)
.pluck(:id)
@all_state_dossiers = procedure.dossiers.all_state @termines_dossiers = procedure.dossiers.includes(:user).termine
@archived_dossiers = procedure.dossiers.archived @all_state_dossiers = procedure.dossiers.includes(:user).all_state
@archived_dossiers = procedure.dossiers.includes(:user).archived
@statut = params[:statut].present? ? params[:statut] : 'a-suivre' @statut = params[:statut].present? ? params[:statut] : 'a-suivre'

2
app/views/new_gestionnaire/procedures/_dossier_actions.html.haml
View file

@ -1,5 +1,5 @@
- if dossier.en_construction_ou_instruction? - if dossier.en_construction_ou_instruction?
- if current_gestionnaire.follow?(dossier) - if dossier_is_followed
= link_to unfollow_dossier_path(procedure, dossier), method: :patch, class: 'button' do = link_to unfollow_dossier_path(procedure, dossier), method: :patch, class: 'button' do
%i.unfollow> %i.unfollow>
ne plus suivre ne plus suivre

2
app/views/new_gestionnaire/procedures/show.html.haml
View file

@ -47,6 +47,6 @@
%td.status-col %td.status-col
= link_to(dossier_path(@procedure, dossier), class: 'big-link') do = link_to(dossier_path(@procedure, dossier), class: 'big-link') do
= render partial: 'status', locals: { dossier: dossier } = render partial: 'status', locals: { dossier: dossier }
%td.follow-col= render partial: 'dossier_actions', locals: { procedure: @procedure, dossier: dossier } %td.follow-col= render partial: 'dossier_actions', locals: { procedure: @procedure, dossier: dossier, dossier_is_followed: @followed_dossiers_id.include?(dossier.id) }
- else - else
%h2 Aucun dossier %h2 Aucun dossier