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

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

@ -1,4 +1,4 @@
- if hidden_by_administration && hidden_at
- if hidden_by_administration && hidden_by_expired
%li
= button_to repousser_expiration_instructeur_dossier_path(procedure_id, dossier_id), method: :patch, class: "fr-btn fr-icon-refresh-line" do
= t('views.instructeurs.dossiers.restore_and_extend')

7
app/views/instructeurs/procedures/show.html.haml
View file

@ -144,11 +144,12 @@
- if p.hidden_by_administration_at.present?
%span.cell-link
= column
= "- #{t('views.instructeurs.dossiers.deleted_by_user')}" if p.hidden_by_user_at.present?
- if p.hidden_by_user_at.present?
= "- #{t("views.instructeurs.dossiers.deleted_reason.#{p.hidden_by_reason}")}"
- else
%a.cell-link{ href: path }
= column
= "- #{t('views.instructeurs.dossiers.deleted_by_user')}" if p.hidden_by_user_at.present?
= "- #{t('views.instructeurs.dossiers.deleted_reason', reason: p.hidden_by_reason)}" if p.hidden_by_user_at.present?
%td.status-col
- status = [status_badge(p.state)]
@ -172,7 +173,7 @@
dossier_is_followed: @followed_dossiers_id.include?(p.dossier_id),
close_to_expiration: @statut == 'expirant',
hidden_by_administration: @statut == 'supprimes_recemment',
hidden_at: p.hidden_at.present?,
hidden_by_expired: p.hidden_by_reason == 'expired',
sva_svr: @procedure.sva_svr_enabled?,
has_blocking_pending_correction: @procedure.feature_enabled?(:blocking_pending_correction) && p.pending_correction?,
turbo: false,