Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CMS-1254] Change blank country choice to "Choose a country" #187

Merged
merged 4 commits into from May 15, 2019
Merged

[CMS-1254] Change blank country choice to "Choose a country" #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8f23302
[CMS-1254] Change blank country choice to "Choose a country"
kaedroho May 2, 2019
0d1a93e
Add changelog and increment version
kaedroho May 7, 2019
559f8a9
update base branch
May 15, 2019
1abea6e
fix changelog
May 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
@@ -1,5 +1,12 @@
# Changelog

## 12.1.0
[Full changelog](https://github.com/uktrade/directory-components/pull/187)

### Bug fixes:

- CMS-1245 Changed default country selector text to "Select a country"

## 12.0.0
[Full Changelog](https://github.com/uktrade/directory-components/pull/193/files)

Expand Down Expand Up @@ -67,6 +74,7 @@

- [[CMS-1395]](https://uktrade.atlassian.net/browse/CMS-1395) PersistLocaleMiddleware deletes deprecated cookie names


## 10.8.3

[Full Changelog](https://github.com/uktrade/directory-components/pull/186/files)
Expand Down
4 changes: 2 additions & 2 deletions directory_components/forms.py
View file
Open in desktop
@@ -1,15 +1,15 @@
from django import forms
from django.forms import Select
from django.utils import translation
from django.db.models.fields import BLANK_CHOICE_DASH
from django.conf import settings

from directory_components import fields as components_fields
from directory_constants.choices import COUNTRY_CHOICES

from directory_components import helpers

COUNTRIES = BLANK_CHOICE_DASH + COUNTRY_CHOICES
BLANK_COUNTRY_CHOICE = [("", "Select a country")]
COUNTRIES = BLANK_COUNTRY_CHOICE + COUNTRY_CHOICES


class DirectoryComponentsFormMixin:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@

setup(
name='directory_components',
version='12.0.0',
version='12.1.0',
url='https://github.com/uktrade/directory-components',
license='MIT',
author='Department for International Trade',
Expand Down