entrouvert
/
combo
16
1
Fork 0
Code Issues Pull Requests 10 Releases Wiki Activity

wcs: keep elements ordered as they were by wcs (#45952)

This commit is contained in:
Frédéric Péters 2020-08-18 17:34:43 +02:00 committed by Thomas NOEL
parent 593ba91669
commit d33cdbb47e
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
combo/apps/wcs/utils.py
View File

@ -41,7 +41,7 @@ def get_wcs_json(wcs_site, path):
def get_wcs_options(url, include_category_slug=False):
references = []
for wcs_key, wcs_site in get_wcs_services().items():
for wcs_key, wcs_site in sorted(get_wcs_services().items(), key=lambda x: x[1]['title']):
site_title = wcs_site.get('title')
response_json = get_wcs_json(wcs_site, url)
if type(response_json) is dict:
@ -62,5 +62,4 @@ def get_wcs_options(url, include_category_slug=False):
else:
reference = '%s:%s' % (wcs_key, slug)
references.append((reference, label))
references.sort(key=lambda x: x[1])
return references

10
tests/test_wcs.py
View File

@ -37,10 +37,10 @@ pytestmark = pytest.mark.django_db
WCS_FORMDEFS_DATA = [
{'slug': 'form-title', 'title': 'form title', 'url': '/form-title/', 'keywords': ['foo', 'bar']},
{'slug': 'a-second-form-title', 'title': 'a second form title', 'url': '/a-second-form-title/'},
{'slug': 'a-private-form', 'title': 'a private form', 'url': '/a-private-form/'},
{'slug': 'third-form-title', 'title': 'third form title', 'url': '/third-form-title/'},
{'slug': 'a-second-form-title', 'title': 'a second form title', 'url': '/a-second-form-title/'},
{'slug': 'form-title', 'title': 'form title', 'url': '/form-title/', 'keywords': ['foo', 'bar']},
{'slug': 'third-form-title', 'title': 'Third form title', 'url': '/third-form-title/'},
]
WCS_CATEGORIES_DATA = [
@ -151,11 +151,11 @@ def test_form_cell_setup(mock_send):
(u'default:a-private-form', u'test : a private form'),
(u'default:a-second-form-title', u'test : a second form title'),
(u'default:form-title', u'test : form title'),
(u'default:third-form-title', u'test : third form title'),
(u'default:third-form-title', u'test : Third form title'),
(u'other:a-private-form', u'test2 : a private form'),
(u'other:a-second-form-title', u'test2 : a second form title'),
(u'other:form-title', u'test2 : form title'),
(u'other:third-form-title', u'test2 : third form title')]
(u'other:third-form-title', u'test2 : Third form title')]
@mock.patch('combo.apps.wcs.utils.requests.send', side_effect=mocked_requests_send)