Skip to content

Commit 96c4deb

Browse files
authored
Merge pull request #2493 from strictdoc-project/stanislaw/section
chore(export/html): remove unused is_section() from several templates
2 parents 18626c9 + c0b4b5d commit 96c4deb

File tree

3 files changed

+21
-30
lines changed

3 files changed

+21
-30
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{%- set document = view_object.traceability_index.document_tree.get_document_by_path(file.full_path) %}
22
{%- if not document.document_is_included() %}
33
"{{ document.meta.get_html_doc_link() }}": [
4-
{% with section = document -%}
5-
{%- include "screens/project_index/project_map_section.jinja" %}
4+
{% with node = document -%}
5+
{%- include "screens/project_index/project_map_node.jinja" %}
66
{%- endwith %} ],
77
{%- endif -%}
Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,24 @@
11
{%- assert node is defined -%}
22

3-
{%- set mid = '' -%}
4-
{%- if node.reserved_mid is defined and node.mid_permanent is defined and node.mid_permanent -%}
5-
{%- set mid = node.reserved_mid -%}
6-
{%- endif -%}
3+
{# FIXME: Improve the flow. #}
4+
{%- if node.__class__.__name__ != "DocumentFromFile" -%}
5+
{%- set mid = '' -%}
6+
{%- if node.reserved_mid is defined and node.mid_permanent is defined and node.mid_permanent -%}
7+
{%- set mid = node.reserved_mid -%}
8+
{%- endif -%}
79

8-
{%- set uid = '' -%}
9-
{%- if node.reserved_uid is defined -%}
10-
{%- set uid = node.reserved_uid -%}
11-
{%- endif %}
10+
{%- set uid = '' -%}
11+
{%- if node.reserved_uid is defined -%}
12+
{%- set uid = node.reserved_uid -%}
13+
{%- endif %}
1214

1315
{ {%- if mid -%}"MID":"{{ mid }}",{%- endif -%}{% if uid -%}"UID":"{{ uid }}",{%- endif -%}"_LINK":"{{ view_object.render_local_anchor(node) }}" },
16+
{%- endif -%}
17+
18+
{% if node.section_contents %}
19+
{%- for node_ in node.section_contents -%}
20+
{% with node = node_ %}
21+
{%- include "screens/project_index/project_map_node.jinja" -%}
22+
{% endwith %}
23+
{%- endfor -%}
24+
{%- endif -%}

strictdoc/export/html/templates/screens/project_index/project_map_section.jinja

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)