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

dont assign twice dossiers_visibles to make it clearer

Browse source
This commit is contained in:
Lisa Durand 2023-07-24 10:57:00 +02:00
parent 385d4b4fa5
commit 1290cf5f29
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/users/dossiers_controller.rb
View file

@ -21,16 +21,16 @@ module Users
def index def index
dossiers = Dossier.includes(:procedure).order_by_updated_at dossiers = Dossier.includes(:procedure).order_by_updated_at
dossiers_visibles = dossiers.visible_by_user @all_dossiers = dossiers.visible_by_user + current_user.deleted_dossiers
@all_dossiers = dossiers_visibles + current_user.deleted_dossiers
@all_dossiers_uniq_procedures_count = @all_dossiers.map(&:procedure).pluck(:id).uniq.count @all_dossiers_uniq_procedures_count = @all_dossiers.map(&:procedure).pluck(:id).uniq.count
@procedure_id = params[:procedure_id] @procedure_id = params[:procedure_id]
if @procedure_id.present? if @procedure_id.present?
dossiers = dossiers.where(procedures: { id: @procedure_id }) dossiers = dossiers.where(procedures: { id: @procedure_id })
dossiers_visibles = dossiers.visible_by_user
end end
dossiers_visibles = dossiers.visible_by_user
@user_dossiers = current_user.dossiers.state_not_termine.merge(dossiers_visibles) @user_dossiers = current_user.dossiers.state_not_termine.merge(dossiers_visibles)
@dossiers_traites = current_user.dossiers.state_termine.merge(dossiers_visibles) @dossiers_traites = current_user.dossiers.state_termine.merge(dossiers_visibles)
@dossiers_invites = current_user.dossiers_invites.merge(dossiers_visibles) @dossiers_invites = current_user.dossiers_invites.merge(dossiers_visibles)