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 creation of need title nodes #1008

Merged
merged 1 commit into from
Sep 4, 2023
Merged

🐛 Fix creation of need title nodes #1008

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 8 additions & 9 deletions sphinx_needs/layout.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,6 @@ def meta(self, name: str, prefix: Optional[str] = None, show_empty: bool = False
:param show_empty: If false and requested need-value is None or '', no output is returned. Default: false
:return: docutils node
"""

data_container = nodes.inline(classes=["needs_" + name])
if prefix:
prefix_node = self._parse(prefix)
Expand All @@ -513,24 +512,24 @@ def meta(self, name: str, prefix: Optional[str] = None, show_empty: bool = False
if isinstance(data, str):
if len(data) == 0 and not show_empty:
return []
# data_node = nodes.inline(classes=["needs_data"])
# data_node.append(nodes.Text(data)
# data_container.append(data_node)

needs_string_links_option: List[str] = []
for v in self.needs_config.string_links.values():
needs_string_links_option.extend(v["options"])

if name in needs_string_links_option:
data = re.split(r",|;", data)
data = [i.strip() for i in data if len(i) != 0]
data_list: List[str] = (
[i.strip() for i in re.split(r",|;", data) if len(i) != 0]
if name in needs_string_links_option
else [data]
)

matching_link_confs = []
for link_conf in self.string_links.values():
if name in link_conf["options"]:
matching_link_confs.append(link_conf)

data_node = nodes.inline(classes=["needs_data"])
for index, datum in enumerate(data):
for index, datum in enumerate(data_list):
if matching_link_confs:
data_node += match_string_link(
text_item=datum,
Expand All @@ -544,7 +543,7 @@ def meta(self, name: str, prefix: Optional[str] = None, show_empty: bool = False
ref_item = nodes.Text(datum)
data_node += ref_item

if (isinstance(data, list) and index + 1 < len(data)) or index + 1 < len([data]):
if (name in needs_string_links_option and index + 1 < len(data)) or index + 1 < len([data]):
data_node += nodes.emphasis("; ", "; ")

data_container.append(data_node)
Expand Down