darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-25 08:44:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2260 from alphagov/remove-govuk-from-brand-type

Browse Source 
Remove GOV.UK as option when creating a branding
This commit is contained in:
Chris Hill-Scott
2018-08-29 15:53:19 +01:00
committed by GitHub
parent 87040c153c 278f7e534c
commit fab754a535
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/main/forms.py
View File

@@ -727,7 +727,6 @@ class ServiceUpdateEmailBranding(StripWhitespaceForm):
brand_type = RadioField( brand_type = RadioField(
"Brand type", "Brand type",
choices=[ choices=[
('govuk', 'GOV.UK only'),
('both', 'GOV.UK and branding'), ('both', 'GOV.UK and branding'),
('org', 'Branding only'), ('org', 'Branding only'),
('org_banner', 'Branding banner'), ('org_banner', 'Branding banner'),

2
app/main/views/email_branding.py
View File

@@ -91,7 +91,7 @@ def update_email_branding(branding_id, logo=None):
@login_required @login_required
@user_is_platform_admin @user_is_platform_admin
def create_email_branding(logo=None): def create_email_branding(logo=None):
form = ServiceUpdateEmailBranding(brand_type='govuk') form = ServiceUpdateEmailBranding(brand_type='org')
if form.validate_on_submit(): if form.validate_on_submit():
if form.file.data: if form.file.data:

8
tests/app/main/views/test_email_branding.py
View File

@@ -92,7 +92,7 @@ def test_create_new_email_branding_without_logo(
'text': 'new text', 'text': 'new text',
'name': 'new name', 'name': 'new name',
'domain': 'sample.com', 'domain': 'sample.com',
'brand_type': 'govuk' 'brand_type': 'org'
} }
mock_persist = mocker.patch('app.main.views.email_branding.persist_logo') mock_persist = mocker.patch('app.main.views.email_branding.persist_logo')
@@ -131,7 +131,7 @@ def test_create_new_email_branding_when_branding_saved(
'text': 'new text', 'text': 'new text',
'name': 'new name', 'name': 'new name',
'domain': 'sample.com', 'domain': 'sample.com',
'brand_type': 'govuk' 'brand_type': 'org_banner'
} }
temp_filename = LOGO_LOCATION_STRUCTURE.format( temp_filename = LOGO_LOCATION_STRUCTURE.format(
@@ -230,7 +230,7 @@ def test_update_existing_branding(
'text': 'new text', 'text': 'new text',
'name': 'new name', 'name': 'new name',
'domain': 'sample.com', 'domain': 'sample.com',
'brand_type': 'govuk' 'brand_type': 'both'
} }
temp_filename = LOGO_LOCATION_STRUCTURE.format( temp_filename = LOGO_LOCATION_STRUCTURE.format(
@@ -342,7 +342,7 @@ def test_colour_regex_validation(
'text': 'new text', 'text': 'new text',
'name': 'new name', 'name': 'new name',
'domain': 'sample.com', 'domain': 'sample.com',
'brand_type': 'govuk' 'brand_type': 'org'
} }
mocker.patch('app.main.views.email_branding.delete_temp_files_created_by') mocker.patch('app.main.views.email_branding.delete_temp_files_created_by')