Skip to content

Commit

Permalink
Merge branch 'develop' into feature/epic_498/base
Browse files Browse the repository at this point in the history
  • Loading branch information
@cedrikv
cedrikv committed Aug 7, 2020
2 parents 70278c8 + 4f88207 commit 003db32
Show file tree
Hide file tree
Showing 32 changed files with 673 additions and 406 deletions.
2 changes: 2 additions & 0 deletions atramhasis/mappers.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,8 @@ def map_concept(concept, concept_json, skos_manager):
except NoResultFound:
broader_concept = Concept(concept_id=broader['id'], conceptscheme_id=concept.conceptscheme_id)
concept.broader_concepts.add(broader_concept)
if 'infer_concept_relations' in concept_json:
concept.infer_concept_relations = concept_json['infer_concept_relations']
return concept


Expand Down
3 changes: 2 additions & 1 deletion atramhasis/renderers.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,8 @@ def collection_adapter(obj, request):
'sources': obj.sources,
'members': [map_relation(c, language) for c in obj.members],
'member_of': [map_relation(c, language) for c in obj.member_of],
'superordinates': [map_relation(c, language) for c in obj.broader_concepts]
'superordinates': [map_relation(c, language) for c in obj.broader_concepts],
'infer_concept_relations': obj.infer_concept_relations
}


Expand Down
3 changes: 2 additions & 1 deletion atramhasis/scaffolds/atramhasis_demo/+package+/skos/__init__.py_tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,8 @@ def create_registry(request):
'created': [date(2011,5,23)],
'language': ['nl-BE', 'la'],
'license': LICENSES
}
},
'atramhasis.force_display_label_language': 'la'
},
request.db,
uri_generator=UriPatternGenerator('https://id.erfgoed.net/thesauri/soorten/%s')
Expand Down
3 changes: 2 additions & 1 deletion atramhasis/skos/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,8 @@ def create_registry(request):
'created': [date(2011, 5, 23)],
'language': ['nl-BE', 'la'],
'license': LICENSES
}
},
'atramhasis.force_display_label_language': 'la'
},
request.db,
uri_generator=UriPatternGenerator('https://id.erfgoed.net/thesauri/soorten/%s')
Expand Down
18 changes: 9 additions & 9 deletions atramhasis/templates/concept.jinja2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
</div>
{% if concept %}
<div class="large-12 columns panel">
<h1 class="panel-header left word-wrap-element">{{ concept.label(request.locale_name).label|title }}</h1>
<h1 class="panel-header left word-wrap-element">{{ concept.label(locale).label|title }}</h1>
<h2 class="id-header right">[ ID : {{ concept.concept_id }} ]</h2>
<hr>
<dl class="infolist clearfix">
Expand Down Expand Up @@ -105,10 +105,10 @@
<div class="clearfix">
<h4 class="relations-subtitle">{% trans %}broader{% endtrans %}</h4>
{% if concept.broader_concepts|length > 0 %}
{{ render_relaties_lijst(request, concept.broader_concepts, scheme_id) }}
{{ render_relaties_lijst(request, concept.broader_concepts, scheme_id, locale) }}
{% endif %}
{% if concept.member_of|length > 0 %}
{{ render_relaties_lijst(request, concept.member_of, scheme_id) }}
{{ render_relaties_lijst(request, concept.member_of, scheme_id, locale) }}
{% endif %}
</div>
{% endif %}
Expand All @@ -118,10 +118,10 @@
<div class="clearfix">
<h4 class="relations-subtitle">{% trans %}narrower{% endtrans %}</h4>
{% if concept.narrower_concepts|length > 0 %}
{{ render_relaties_lijst(request, concept.narrower_concepts, scheme_id) }}
{{ render_relaties_lijst(request, concept.narrower_concepts, scheme_id, locale) }}
{% endif %}
{% if concept.narrower_collections|length > 0 %}
{{ render_relaties_lijst(request, concept.narrower_collections, scheme_id) }}
{{ render_relaties_lijst(request, concept.narrower_collections, scheme_id, locale) }}
{% endif %}
</div>
{% endif %}
Expand All @@ -130,7 +130,7 @@
{% if concept.related_concepts|length > 0 %}
<div class="clearfix">
<h4 class="relations-subtitle">{% trans %}related{% endtrans %}</h4>
{{ render_relaties_lijst(request, concept.related_concepts, scheme_id) }}
{{ render_relaties_lijst(request, concept.related_concepts, scheme_id, locale) }}
</div>
{% endif %}
{% endif %}
Expand All @@ -141,18 +141,18 @@
<div class="clearfix">
<h4 class="relations-subtitle">{% trans %}broader{% endtrans %}</h4>
{% if concept.broader_concepts|length > 0 %}
{{ render_relaties_lijst(request, concept.broader_concepts, scheme_id) }}
{{ render_relaties_lijst(request, concept.broader_concepts, scheme_id, locale) }}
{% endif %}
{% if concept.member_of|length > 0 %}
{{ render_relaties_lijst(request, concept.member_of, scheme_id) }}
{{ render_relaties_lijst(request, concept.member_of, scheme_id, locale) }}
{% endif %}
</div>
{% endif %}
{# // narrower#}
{% if concept.members|length > 0 %}
<div class="clearfix">
<h4 class="relations-subtitle">{% trans %}narrower{% endtrans %}</h4>
{{ render_relaties_lijst(request, concept.members, scheme_id) }}
{{ render_relaties_lijst(request, concept.members, scheme_id, locale) }}
</div>
{% endif %}
{% endif %}
Expand Down
6 changes: 3 additions & 3 deletions atramhasis/templates/macros.jinja2
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{% macro render_relaties_lijst(request, relaties, scheme_id) %}
{% macro render_relaties_lijst(request, relaties, scheme_id, locale) %}
{% if relaties|length > 0 %}
{%- set counter = 0 %}
<div class="large-12 columns">
{%- for c in relaties|label_sort(language=request.locale_name) %}
{%- for c in relaties|label_sort(language=locale) %}
{%- set counter = counter + 1 %}
<div class="large-3 large-3-pad columns result-grid" {% if counter == relaties|length %}style="float: left;"{% endif %}>
<a href="{{ request.route_path('concept', scheme_id = scheme_id, c_id = c.concept_id) }}"><h5>{{ c.label(request.locale_name).label }}</h5> <span> [ ID : {{ c.concept_id }} ]</span><br><small>{{ c.type }}</small></a>
<a href="{{ request.route_path('concept', scheme_id = scheme_id, c_id = c.concept_id) }}"><h5>{{ c.label(locale).label }}</h5> <span> [ ID : {{ c.concept_id }} ]</span><br><small>{{ c.type }}</small></a>
</div>
{%- endfor %}
</div>
Expand Down
Loading

0 comments on commit 003db32

Please sign in to comment.