Skip to content

Commit 709a62b

Browse files
committed
Enter through form new with proper start screen
1 parent 8a96146 commit 709a62b

File tree

4 files changed

+14
-11
lines changed

4 files changed

+14
-11
lines changed

app/controllers/authorization_request_forms_controller.rb

+2-6
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,9 @@ def index
1111
def new
1212
authorize @authorization_request_form, :new?
1313

14-
@authorization_request = authorization_request_class.new(
15-
applicant: current_user,
16-
organization: current_organization,
17-
form_uid: @authorization_request_form.uid,
18-
)
14+
@authorization_definition = @authorization_request_form.authorization_definition
1915

20-
render view_path
16+
render 'authorization_requests/new'
2117
end
2218

2319
def create

app/helpers/authorization_requests_helpers.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module AuthorizationRequestsHelpers
2-
def start_authorization_request_form(form)
2+
def start_authorization_request_form(form, cta: t('start_authorization_request_form.cta'))
33
authorization_request_form(form.authorization_request_class.new(form_uid: form.uid)) do |f|
4-
f.submit t('start_authorization_request_form.cta'), name: :start, id: dom_id(form, :start_authorization_request), class: %w[fr-btn fr-icon-save-line fr-btn--icon-left]
4+
f.submit cta, name: :start, id: dom_id(form, :start_authorization_request), class: %w[fr-btn fr-icon-save-line fr-btn--icon-left]
55
end
66
end
77

app/views/authorization_requests/new.html.erb

+9-3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
</div>
66

77
<div class="fr-mb-4w">
8+
<% if @authorization_request_form.present? %>
9+
<h5>
10+
<%= t('.current_form', authorization_request_form_name: @authorization_request_form.name) %>
11+
</h5>
12+
<% end %>
13+
814
<p>
915
<%= t('.organization.start_text', organization_raison_sociale: current_organization.raison_sociale, organization_siret: current_organization.siret).html_safe %>
1016
</p>
@@ -39,8 +45,8 @@
3945
<% end %>
4046
</div>
4147

42-
<% if @authorization_definition.available_forms.one? %>
43-
<% authorization_request_form = @authorization_definition.available_forms.first %>
48+
<% if @authorization_request_form || @authorization_definition.available_forms.one? %>
49+
<% authorization_request_form = @authorization_request_form || @authorization_definition.available_forms.first %>
4450

4551
<% if authorization_request_form.multiple_steps? %>
4652
<p>
@@ -62,7 +68,7 @@
6268

6369
<br />
6470

65-
<%= start_authorization_request_form(authorization_request_form) %>
71+
<%= start_authorization_request_form(authorization_request_form, cta: t('.cta', authorization_name: @authorization_definition.name)) %>
6672
</p>
6773
<% end %>
6874
<% else %>

config/locales/fr.yml

+1
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ fr:
8989
cta: Remplir une demande
9090
new:
9191
title: &start_new_habilitation_title Démarrer une nouvelle habilitation pour %{authorization_name}
92+
current_form: Via le formulaire " %{authorization_request_form_name} "
9293
organization:
9394
start_text: "Vous êtes sur le point de démarrer une nouvelle demande d'habilitation pour le compte de <strong>%{organization_raison_sociale}</strong> (numéro de siret: <a href=\"https://annuaire-entreprises.data.gouv.fr/etablissement/%{organization_siret}\" target=\"_blank\">%{organization_siret}</a>)."
9495
callout:

0 commit comments

Comments
 (0)