Merge branch 'master' of https://github.com/alphagov/notifications-admin into vb-platform-admin-admin

app/main/forms.py

@@ -511,7 +511,8 @@ class ServiceBrandingOrg(Form):
         choices=[
             ('govuk', 'GOV.UK only'),
             ('both', 'GOV.UK and organisation'),
-            ('org', 'Organisation only')
+            ('org', 'Organisation only'),
+            ('org_banner', 'Organisation banner')
         ],
         validators=[
             DataRequired()

app/main/views/api_keys.py

@@ -13,11 +13,7 @@ from app.notify_client.api_key_api_client import KEY_TYPE_NORMAL, KEY_TYPE_TEST,
 def api_integration(service_id):
     return render_template(
         'views/api/index.html',
-        api_notifications=notification_api_client.get_notifications_for_service(
-            service_id=service_id,
-            include_jobs=False,
-            include_from_test_key=True
-        )
+        api_notifications=notification_api_client.get_api_notifications_for_service(service_id)
     )
 
 

app/main/views/organisations.py

@@ -71,7 +71,9 @@ def manage_org(logo=None):
             return redirect(
                 url_for('.manage_org', logo=upload_filename))
 
-        logo = persist_logo(logo, session["user_id"])
+        if logo:
+            logo = persist_logo(logo, session["user_id"])
+
         delete_temp_files_created_by(session["user_id"])
 
         if org: