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

Gestionnaire: move avis_path to gestionnaire_avis_path

Browse source
This commit is contained in:
simon lehericey 2018-02-21 15:19:04 +01:00
parent 0308345008
commit 9db5e82b41
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/dossier_link_helper.rb
View file

@ -5,7 +5,7 @@ module DossierLinkHelper
else else
avis = dossier.avis.find_by(gestionnaire: gestionnaire) avis = dossier.avis.find_by(gestionnaire: gestionnaire)
if avis.present? if avis.present?
avis_path(avis) gestionnaire_avis_path(avis)
end end
end end
end end

4
app/views/new_gestionnaire/avis/_header.html.haml
View file

@ -5,8 +5,8 @@
%li= "#{dossier.procedure.libelle}, dossier nº #{dossier.id}" %li= "#{dossier.procedure.libelle}, dossier nº #{dossier.id}"
%ul.tabs %ul.tabs
%li{ class: current_page?(avis_path(avis)) ? 'active' : nil } %li{ class: current_page?(gestionnaire_avis_path(avis)) ? 'active' : nil }
= link_to 'Demande', avis_path(avis) = link_to 'Demande', gestionnaire_avis_path(avis)
%li{ class: current_page?(instruction_gestionnaire_avis_path(avis)) ? 'active' : nil } %li{ class: current_page?(instruction_gestionnaire_avis_path(avis)) ? 'active' : nil }
= link_to 'Avis', instruction_gestionnaire_avis_path(avis) = link_to 'Avis', instruction_gestionnaire_avis_path(avis)
- if avis.answer == nil - if avis.answer == nil

6
app/views/new_gestionnaire/avis/index.html.haml
View file

@ -30,11 +30,11 @@
- @avis.each do |avis| - @avis.each do |avis|
%tr %tr
%td.number-col %td.number-col
= link_to(avis_path(avis), class: 'cell-link') do = link_to(gestionnaire_avis_path(avis), class: 'cell-link') do
%span.icon.folder %span.icon.folder
#{avis.dossier.id} #{avis.dossier.id}
%td= link_to(avis.dossier.user.email, avis_path(avis), class: 'cell-link') %td= link_to(avis.dossier.user.email, gestionnaire_avis_path(avis), class: 'cell-link')
%td= link_to(avis.dossier.procedure.libelle, avis_path(avis), class: 'cell-link') %td= link_to(avis.dossier.procedure.libelle, gestionnaire_avis_path(avis), class: 'cell-link')
= paginate(@avis) = paginate(@avis)
- else - else
%h2.empty-text Aucun avis %h2.empty-text Aucun avis

2
app/views/new_gestionnaire/avis/instruction.html.haml
View file

@ -11,7 +11,7 @@
%span.date Demande d'avis envoyée le #{I18n.l(@avis.created_at.localtime, format: '%d/%m/%y')} %span.date Demande d'avis envoyée le #{I18n.l(@avis.created_at.localtime, format: '%d/%m/%y')}
%p.introduction= @avis.introduction %p.introduction= @avis.introduction
= form_for @avis, url: avis_path(@avis), html: { class: 'form' } do |f| = form_for @avis, url: gestionnaire_avis_path(@avis), html: { class: 'form' } do |f|
= f.text_area :answer, rows: 3, placeholder: 'Votre avis', required: true = f.text_area :answer, rows: 3, placeholder: 'Votre avis', required: true
.flex.justify-between.align-baseline .flex.justify-between.align-baseline
%p.confidentiel.flex %p.confidentiel.flex

2
spec/features/new_gestionnaire/gestionnaire_spec.rb
View file

@ -80,7 +80,7 @@ feature 'The gestionnaire part' do
expect(page).to have_text('avis donnés 0') expect(page).to have_text('avis donnés 0')
click_on dossier.user.email click_on dossier.user.email
expect(page).to have_current_path(avis_path(dossier.avis.first)) expect(page).to have_current_path(gestionnaire_avis_path(dossier.avis.first))
within(:css, '.tabs') do within(:css, '.tabs') do
click_on 'Avis' click_on 'Avis'

2
spec/helpers/dossier_link_helper_spec.rb
View file

@ -21,7 +21,7 @@ describe DossierLinkHelper do
let(:gestionnaire) { create(:gestionnaire) } let(:gestionnaire) { create(:gestionnaire) }
let!(:avis) { create(:avis, dossier: dossier, gestionnaire: gestionnaire) } let!(:avis) { create(:avis, dossier: dossier, gestionnaire: gestionnaire) }
it { expect(helper.dossier_linked_path(gestionnaire, dossier)).to eq(avis_path(avis)) } it { expect(helper.dossier_linked_path(gestionnaire, dossier)).to eq(gestionnaire_avis_path(avis)) }
end end
end end
end end