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

dont use depreciated column hidden_at

Browse source
This commit is contained in:
Lisa Durand 2024-06-12 16:32:42 +02:00
parent 8b88fafc25
commit 9346020889
No known key found for this signature in database
GPG key ID: 0DF91F2CA1E8B816
17 changed files with 63 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -57,7 +57,7 @@ module Users
@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)
@dossiers_supprimes_recemment = (current_user.dossiers.hidden_by_user.or(current_user.dossiers.hidden_by_automatic)).merge(ordered_dossiers)
@dossiers_supprimes_recemment = current_user.dossiers.hidden_by_user.merge(ordered_dossiers)
@dossier_transferes = @dossiers_visibles.where(dossier_transfer_id: DossierTransfer.for_email(current_user.email))
@dossiers_close_to_expiration = current_user.dossiers.close_to_expiration.merge(@dossiers_visibles)
@dossiers_supprimes_definitivement = deleted_dossiers
@ -256,8 +256,8 @@ module Users
def extend_conservation
dossier.extend_conservation(dossier.procedure.duree_conservation_dossiers_dans_ds.months)
if dossier.hidden_at.present?
dossier.update!(hidden_at: nil, hidden_by_reason: nil)
if dossier.hidden_by_reason == 'expired'
dossier.update!(hidden_by_administration_at: nil, hidden_by_user_at: nil, hidden_by_reason: nil)
end
flash[:notice] = t('views.users.dossiers.archived_dossier', duree_conservation_dossiers_dans_ds: dossier.procedure.duree_conservation_dossiers_dans_ds)
@ -536,7 +536,7 @@ module Users
elsif action_name == 'restore'
Dossier.hidden_by_user
elsif action_name == 'extend_conservation'
Dossier.visible_by_user.or(Dossier.hidden_by_automatic)
Dossier.visible_by_user.or(Dossier.hidden_by_expired)
else
Dossier.visible_by_user
end