Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: uktrade/directory-cms
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2020.01.20
Choose a base ref
...
head repository: uktrade/directory-cms
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2020.01.29
Choose a head ref
  • 10 commits
  • 4 files changed
  • 3 contributors

Commits on Jan 29, 2020

  1. do not include draft country guide pages

    Alessandro committed Jan 29, 2020
    Copy the full SHA
    4daa1c3 View commit details
  2. Merge pull request #768 from uktrade/fix-markets-page-draft-bug

    Do not include draft country guide pages in markets
    sdonk authored Jan 29, 2020
    Copy the full SHA
    8c5c0b1 View commit details
  3. Merge pull request #769 from uktrade/develop

    Staging release
    richtier authored Jan 29, 2020
    Copy the full SHA
    007c1ac View commit details
  4. Copy the full SHA
    64c4713 View commit details
  5. Update python to 3.6.10

    sdonk authored Jan 29, 2020
    Copy the full SHA
    88ab43a View commit details
  6. Merge pull request #772 from uktrade/update-python-3-6-10

    Update python to 3.6.10
    sdonk authored Jan 29, 2020
    Copy the full SHA
    ee22175 View commit details
  7. Copy the full SHA
    787ea47 View commit details
  8. Merge pull request #771 from uktrade/2020-01-29-release

    Update changelog for 2020.01.29 release
    sdonk authored Jan 29, 2020
    Copy the full SHA
    e2b15af View commit details
  9. Merge pull request #773 from uktrade/develop

    staging release
    sdonk authored Jan 29, 2020
    Copy the full SHA
    7142c82 View commit details
  10. Merge pull request #770 from uktrade/release

    2020.01.29 prod release
    sdonk authored Jan 29, 2020
    Copy the full SHA
    6630c49 View commit details
Showing with 11 additions and 2 deletions.
  1. +6 −0 CHANGELOG.md
  2. +1 −1 export_readiness/views.py
  3. +1 −1 runtime.txt
  4. +3 −0 tests/export_readiness/test_views.py
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -2,6 +2,12 @@

## Pre-release

## [2020.01.29](https://github.com/uktrade/directory-cms/releases/tag/2020.01.29)
[Full Changelog](https://github.com/uktrade/directory-cms/compare/2020.01.20...2020.01.29)

### Implemented enhancements
- No ticket - Fix markets page draft results bug

## [2020.01.20](https://github.com/uktrade/directory-cms/releases/tag/2020.01.20)
[Full Changelog](https://github.com/uktrade/directory-cms/compare/2020.01.09...2020.01.20)

2 changes: 1 addition & 1 deletion export_readiness/views.py
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@ def cache_key(self):
return f'countryguide_{industry}{region}'

def get_queryset(self):
queryset = models.CountryGuidePage.objects.all()
queryset = models.CountryGuidePage.objects.filter(live=True)
industry = self.request.query_params.get('industry')
region = self.request.query_params.get('region')
if not industry and not region:
2 changes: 1 addition & 1 deletion runtime.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
python-3.6.8
python-3.6.10
3 changes: 3 additions & 0 deletions tests/export_readiness/test_views.py
Original file line number Diff line number Diff line change
@@ -290,6 +290,9 @@ def test_lookup_market_guides_all_filters_no_cache(client):
market1.tags = [tag]
market1.save()
factories.CountryGuidePageFactory(country=country)
market2 = factories.CountryGuidePageFactory(country=country, live=False) # draft
market2.tags = [tag]
market2.save()
url = reverse('api:lookup-country-guides-list-view')

response = client.get(f'{url}?industry={tag.name}&region={region.name}')