Merge pull request #142 from sgmap/fix-132

[Fix #132] Show the dossier link in the dossier detail for Users
This commit is contained in:
gregoirenovel 2017-04-26 15:48:56 +02:00 committed by GitHub
commit c0fd56ea8e
2 changed files with 3 additions and 3 deletions

View file

@ -40,10 +40,10 @@
- unless champ.decorate.value.blank?
- if champ.type_champ == 'dossier_link'
- dossier = Dossier.includes(:procedure).find_by(id: champ.decorate.value)
- if dossier && gestionnaire_signed_in?
- if dossier
= link_to(dossier.procedure.libelle, backoffice_dossier_path(champ.decorate.value), target: '_blank')
- else
= dossier.nil? ? 'pas de dossier associé' : dossier.procedure.libelle
Pas de dossier associé
- else
= champ.decorate.value.html_safe

View file

@ -38,7 +38,7 @@ feature 'As a User I want to edit a dossier I own' do
# Linked Dossier
linked_dossier_id = dossier.champs.find { |c| c.type_de_champ.type_champ == 'dossier_link' }.value
linked_dossier = Dossier.find(linked_dossier_id)
expect(page).to have_content(linked_dossier.procedure.libelle)
expect(page).to have_link(linked_dossier.procedure.libelle)
page.find_by_id('maj_infos').trigger('click')
expect(page).to have_current_path(users_dossier_description_path(dossier.id.to_s), only_path: true)