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

(fix+feat): If a language doesn't have a value for taxonomy set the default language value #172

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

(fix+feat): If a language doesn't have a value for taxonomy set the default language value #172

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e47cd20
Default language fallback
dobri1408 Feb 20, 2025
245e390
Default language fallback
dobri1408 Feb 20, 2025
01b2a0a
Update jsonimpl.py
dobri1408 Feb 20, 2025
8b0cca3
Update jsonimpl.py
dobri1408 Feb 20, 2025
fb5548f
Update update.py
dobri1408 Feb 20, 2025
11b1bde
Update jsonimpl.py
dobri1408 Feb 20, 2025
0776a7b
Update update.py
dobri1408 Feb 20, 2025
3a349a9
Update update.py
dobri1408 Feb 20, 2025
c3f92b2
Update jsonimpl.py
dobri1408 Feb 23, 2025
d5ae093
Update update.py
dobri1408 Feb 23, 2025
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
10 changes: 9 additions & 1 deletion src/collective/taxonomy/jsonimpl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ def generate_json(self, root):
item = {}
item["key"] = root.find("termIdentifier").text
captionnode = root.find("caption")

translations = {}
for langstringnode in captionnode.getchildren():
translations[langstringnode.get("language")] = langstringnode.text
Expand Down Expand Up @@ -69,6 +70,7 @@ def get_data(self):

def get_languages_mapping(self):
"""Get mapping token/value for languages."""

vocab = AvailableContentLanguageVocabularyFactory(self.context)
language_tool = api.portal.get_tool("portal_languages")
plone_selected_languages = language_tool.supported_langs
Expand Down Expand Up @@ -100,7 +102,9 @@ class ImportJson(BrowserView):

def __call__(self):
request = self.request

if request.method == "POST":

data = json.loads(request.get("BODY", ""))
taxonomy = queryUtility(ITaxonomy, name=data["taxonomy"])
tree = data["tree"]
Expand Down Expand Up @@ -137,10 +141,14 @@ def __call__(self):
)

def generate_data_for_taxonomy(self, parsed_data, language, path=PATH_SEPARATOR):
data = json.loads(self.request.get("BODY", ""))
taxonomy = queryUtility(ITaxonomy, name=data["taxonomy"])
default_language = taxonomy.default_language
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code looks very brittle...

Imagine:

self.request.get("BODY", "")

evaluates to "".
Then you will have:

>>> json.loads("")
Traceback (most recent call last):
...
    raise JSONDecodeError("Expecting value", s, err.value) from None
json.decoder.JSONDecodeError: Expecting value: line 1 column 1 (char 0)

but every line that follow can easily fail if the request body is not exactly what you expect.

result = []
for item in parsed_data:
new_key = item["key"]
title = item["translations"].get(language, "")
default_title = item["translations"].get(default_language, "")
title = item["translations"].get(language, "") or default_title
new_path = f"{path}{title}"
result.append(
(
Expand Down
9 changes: 8 additions & 1 deletion src/collective/taxonomy/restapi/services/taxonomy/update.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
from zope.schema import getFields
from zope.schema.interfaces import ValidationError

import json


@implementer(IPublishTraverse)
class TaxonomyPatch(Service):
Expand All @@ -34,10 +36,14 @@ def publishTraverse(self, request, name): # noqa

def generate_data_for_taxonomy(self, parsed_data, language, path=PATH_SEPARATOR):
result = []
data = json.loads(self.request.get("BODY", ""))
taxonomy = queryUtility(ITaxonomy, name=data["taxonomy"])
default_language = taxonomy.default_language
for item in parsed_data:
translations = item.get("translations", {})
new_key = item["key"]
title = item["title"]
default_title = item["translations"].get(default_language, "")
title = item["translations"].get(language, "") or default_title
if language in translations:
title = translations[language]
new_path = f"{path}{title}"
Expand All @@ -57,6 +63,7 @@ def generate_data_for_taxonomy(self, parsed_data, language, path=PATH_SEPARATOR)

def reply(self):
"""Reply"""

if not self.taxonomy_id:
raise Exception("No taxonomy name provided")

Expand Down
Loading