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

refactor

Browse source
This commit is contained in:
Christophe Robillard 2020-03-24 13:53:15 +01:00
parent fcfa19a4aa
commit 78fcdd42a6
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/instructeurs/procedures_controller.rb
View file

@ -115,8 +115,10 @@ module Instructeurs
def deleted_dossiers
@procedure = procedure
@deleted_dossiers = @procedure.deleted_dossiers.where.not(state: :brouillon)
@deleted_dossiers = @deleted_dossiers.order(:dossier_id).page params[:page]
@deleted_dossiers = @procedure
.deleted_dossiers.where.not(state: :brouillon)
.order(:dossier_id)
.page params[:page]
end
def update_displayed_fields

2
app/helpers/dossier_helper.rb
View file

@ -84,7 +84,7 @@ module DossierHelper
end
def status_badge(state)
status_text = state.tr('_', ' ')
status_text = dossier_display_state(state, lower: true)
status_class = state.tr('_', '-')
content_tag(:span, status_text, class: "label #{status_class} ")
end