From 3be82bafd57c65b2db008797a82da475e0e61101 Mon Sep 17 00:00:00 2001
From: Leo Hemsted <leo.hemsted@digital.cabinet-office.gov.uk>
Date: Tue, 5 Feb 2019 16:33:36 +0000
Subject: [PATCH] fix request letter branding page

(it can now have a null type). also fix nav.py
---
 app/navigation.py                                         | 8 ++++----
 .../views/service-settings/request-letter-branding.html   | 6 +++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/navigation.py b/app/navigation.py
index f784360fe..13355a3a3 100644
--- a/app/navigation.py
+++ b/app/navigation.py
@@ -248,7 +248,7 @@ class HeaderNavigation(Navigation):
         'service_switch_research_mode',
         'services_or_dashboard',
         'set_free_sms_allowance',
-        'set_letter_branding',
+        'service_set_letter_branding',
         'set_organisation_type',
         'set_sender',
         'set_template_sender',
@@ -364,7 +364,7 @@ class MainNavigation(Navigation):
             'service_settings',
             'service_sms_senders',
             'set_free_sms_allowance',
-            'set_letter_branding',
+            'service_set_letter_branding',
             'set_organisation_type',
             'submit_request_to_go_live',
         },
@@ -703,7 +703,7 @@ class CaseworkNavigation(Navigation):
         'service_switch_research_mode',
         'services_or_dashboard',
         'set_free_sms_allowance',
-        'set_letter_branding',
+        'service_set_letter_branding',
         'set_organisation_type',
         'set_sender',
         'set_template_sender',
@@ -935,7 +935,7 @@ class OrgNavigation(Navigation):
         'service_switch_research_mode',
         'services_or_dashboard',
         'set_free_sms_allowance',
-        'set_letter_branding',
+        'service_set_letter_branding',
         'set_organisation_type',
         'set_sender',
         'set_template_sender',
diff --git a/app/templates/views/service-settings/request-letter-branding.html b/app/templates/views/service-settings/request-letter-branding.html
index 6a390bd3f..85c645fe9 100644
--- a/app/templates/views/service-settings/request-letter-branding.html
+++ b/app/templates/views/service-settings/request-letter-branding.html
@@ -12,7 +12,11 @@
   <div class="grid-row">
     <div class="column-three-quarters">
       <p>
-        Your letters have the {{ current_service.letter_branding }} logo.
+        {% if current_service.letter_branding_id %}
+          Your letters have the {{ current_service.letter_branding.name }} logo.
+        {% else %}
+          Your letters have no logo.
+        {% endif %}
       </p>
       <p>
         <a href="{{ url_for('main.feedback', ticket_type='ask-question-give-feedback', body='letter-branding') }}">Contact support</a>