Skip to content

Commit

Permalink
Merge pull request #2321 from uktrade/dev
Browse files Browse the repository at this point in the history
Extended UAT release
  • Loading branch information
hnryjmes authored Jan 20, 2025
2 parents 623988d + 7699fd9 commit cc8ba51
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 6 deletions.
15 changes: 14 additions & 1 deletion exporter/applications/views/parties/end_users.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,13 @@ class AddEndUserView(LoginRequiredMixin, FormView):

def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context["form_title"] = self.form_class.Layout.TITLE
context.update(
{
"form_title": self.form_class.Layout.TITLE,
"back_link_text": "Back to application overview",
"back_link_url": reverse("applications:task_list", kwargs=self.kwargs),
}
)
return context

def form_valid(self, form):
Expand Down Expand Up @@ -136,6 +142,13 @@ class SetPartyView(LoginRequiredMixin, BaseSessionWizardView):
def application(self):
return get_application(self.request, self.kwargs["pk"])

# back_link_url only needs to be set for the first question in the form wizard,
# for subsequent questions the back link is generated through another mechanism
def get_context_data(self, form, **kwargs):
context = super().get_context_data(form, **kwargs)
context.update({"back_link_url": reverse("applications:add_end_user", kwargs=self.kwargs)})
return context

def get_form_kwargs(self, step=None):
kwargs = super().get_form_kwargs(step)

Expand Down
3 changes: 3 additions & 0 deletions exporter/templates/core/hub.html
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,9 @@ <h2 class="govuk-!-margin-top-0">
{% lcs 'hub.Tiles.HELP_AND_SUPPORT' %}
</span>
</h2>
<div class="app-tile__body">
<a class="govuk-link" href="{% url 'exporter-help-support' %}" target="_blank">Get help with your application.</a>
</div>
<div class="app-tile__body">
{% comment %}/PS-IGNORE{% endcomment %}For support with this service, contact <a class="govuk-link" href="mailto:[email protected]">[email protected]</a>
or call +44(0)20 7215 4595 (select option 2).
Expand Down
9 changes: 4 additions & 5 deletions exporter/templates/includes/notice.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
{% lcs text %}
</p>
</div>

{% if help %}
<p class="lite-information-text__help">
<p class="lite-information-text__help">
{% if help %}
{% lcs help %}
</p>
{% endif %}
{% endif %}
</p>

0 comments on commit cc8ba51

Please sign in to comment.