dont assign twice dossiers_visibles to make it clearer
This commit is contained in:
parent
385d4b4fa5
commit
1290cf5f29
1 changed files with 3 additions and 3 deletions
|
@ -21,16 +21,16 @@ module Users
|
|||
|
||||
def index
|
||||
dossiers = Dossier.includes(:procedure).order_by_updated_at
|
||||
dossiers_visibles = dossiers.visible_by_user
|
||||
@all_dossiers = dossiers_visibles + current_user.deleted_dossiers
|
||||
@all_dossiers = dossiers.visible_by_user + current_user.deleted_dossiers
|
||||
@all_dossiers_uniq_procedures_count = @all_dossiers.map(&:procedure).pluck(:id).uniq.count
|
||||
@procedure_id = params[:procedure_id]
|
||||
|
||||
if @procedure_id.present?
|
||||
dossiers = dossiers.where(procedures: { id: @procedure_id })
|
||||
dossiers_visibles = dossiers.visible_by_user
|
||||
end
|
||||
|
||||
dossiers_visibles = dossiers.visible_by_user
|
||||
|
||||
@user_dossiers = current_user.dossiers.state_not_termine.merge(dossiers_visibles)
|
||||
@dossiers_traites = current_user.dossiers.state_termine.merge(dossiers_visibles)
|
||||
@dossiers_invites = current_user.dossiers_invites.merge(dossiers_visibles)
|
||||
|
|
Loading…
Add table
Reference in a new issue