Instructeurs : fixe la recherche cassée dans la précédente release
This commit is contained in:
parent
4ed840c9e4
commit
81249aa798
5 changed files with 7 additions and 6 deletions
|
@ -4,7 +4,8 @@ class RechercheController < ApplicationController
|
|||
PROJECTIONS = [
|
||||
{ "table" => 'procedure', "column" => 'libelle' },
|
||||
{ "table" => 'user', "column" => 'email' },
|
||||
{ "table" => 'procedure', "column" => 'procedure_id' }
|
||||
{ "table" => 'procedure', "column" => 'procedure_id' },
|
||||
{ "table" => 'dossier', "column" => 'hidden_by_administration_at' }
|
||||
]
|
||||
|
||||
def index
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
archived: dossier.archived,
|
||||
dossier_is_followed: current_instructeur&.follow?(dossier),
|
||||
close_to_expiration: dossier.close_to_expiration?,
|
||||
supprimes_recemment: dossier.hidden_by_administration? }
|
||||
recently_deleted: dossier.hidden_by_administration? }
|
||||
|
||||
|
||||
.state-button
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
%span.icon.archive
|
||||
.dropdown-description
|
||||
Archiver le dossier
|
||||
- if supprimes_recemment
|
||||
- if recently_deleted
|
||||
%li.danger
|
||||
= link_to restore_instructeur_dossier_path(procedure_id, dossier_id), method: :patch, data: { confirm: "Voulez vous vraiment restaurer le dossier #{dossier_id}" } do
|
||||
%span.icon.reply
|
||||
|
|
|
@ -139,7 +139,7 @@
|
|||
archived: p.archived,
|
||||
dossier_is_followed: @followed_dossiers_id.include?(p.dossier_id),
|
||||
close_to_expiration: @statut == 'expirant',
|
||||
supprimes_recemment: @statut == 'supprimes_recemment' }
|
||||
recently_deleted: @statut == 'supprimes_recemment' }
|
||||
|
||||
= pagination
|
||||
- else
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
%th.action-col.follow-col
|
||||
%tbody
|
||||
- @projected_dossiers.each do |p|
|
||||
- procedure_libelle, user_email, procedure_id = p.columns
|
||||
- procedure_libelle, user_email, procedure_id, hidden_by_administration = p.columns
|
||||
- instructeur_dossier = @instructeur_dossiers_ids.include?(p.dossier_id)
|
||||
- expert_dossier = @dossier_avis_ids_h[p.dossier_id].present?
|
||||
- instructeur_and_expert_dossier = instructeur_dossier && expert_dossier
|
||||
|
@ -83,7 +83,7 @@
|
|||
archived: p.archived,
|
||||
dossier_is_followed: @followed_dossiers_id.include?(p.dossier_id),
|
||||
close_to_expiration: nil,
|
||||
supprimes_recemment: @statut == 'supprimes_recemment' }
|
||||
recently_deleted: hidden_by_administration.blank? }
|
||||
|
||||
- else
|
||||
%td
|
||||
|
|
Loading…
Reference in a new issue