Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions news/106.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include vocabulary term token in termlist used to configure the querystring search [jackahl] (#106)
6 changes: 3 additions & 3 deletions plone/app/querystring/registryreader.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,13 @@ def getVocabularyValues(self, values):
title = translate(item.title, context=self.request)
else:
title = item.title
translated.append((title, item.value))
translated.append((title, item.value, item.token))
translated = sorted(
translated,
key=lambda x: normalizeString(safe_unicode(x[0]))
)
for (title, value) in translated:
field['values'][value] = {'title': title}
for (title, value, token) in translated:
field['values'][value] = {'title': title, 'token': token}

return values

Expand Down
2 changes: 1 addition & 1 deletion plone/app/querystring/tests/testRegistryReader.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def test_get_vocabularies(self):
result = reader.getVocabularyValues(result)
vocabulary_result = result.get(
'plone.app.querystring.field.reviewState.values')
self.assertEqual(vocabulary_result, {'foo': {'title': u'bar'}})
self.assertEqual(vocabulary_result, {'foo': {'title': u'bar', 'token': 'foo'}})

def test_map_operations_clean(self):
"""tests if mapOperations is getting all operators correctly"""
Expand Down