Skip to content

Commit

Permalink
Merge pull request ckan#8049 from KatiRG/master_fixorphans
Browse files Browse the repository at this point in the history
close orphan tags in ckan#7590
  • Loading branch information
wardi authored Feb 6, 2024
2 parents da65f53 + c8059bf commit f255092
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions ckan/templates/package/resource_read.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
{% if h.check_access('package_update', {'id':pkg.id }) %}
<li>{% link_for _('Edit resource'), named_route=pkg.type ~ '_resource.edit', id=pkg.name, resource_id=res.id, class_='btn btn-default', icon='pencil' %}</li>
{% block action_manage_inner %}{% endblock %}
<li>{% link_for _('Views'), named_route=pkg.type ~ '_resource.views', id=pkg.name, resource_id=res.id, class_='btn btn-default', icon='chart-bar' %}
<li>{% link_for _('Views'), named_route=pkg.type ~ '_resource.views', id=pkg.name, resource_id=res.id, class_='btn btn-default', icon='chart-bar' %}</li>
{% endif %}
{% endblock action_manage %}
{% if res.url and h.is_url(res.url) %}
Expand Down Expand Up @@ -72,7 +72,7 @@
{% if not res.description and package.notes %}
<h3>{{ _('Dataset description:') }}</h3>
<blockquote>{{ h.markdown_extract(h.get_translated(package, 'notes')) }}</blockquote>
<p>{% trans dataset=h.get_translated(package, 'title'), url=h.url_for(package.type ~ '.read', id=package.name) %}Source: <a href="{{ url }}">{{ dataset }}</a>{% endtrans %}
<p>{% trans dataset=h.get_translated(package, 'title'), url=h.url_for(package.type ~ '.read', id=package.name) %}Source: <a href="{{ url }}">{{ dataset }}</a>{% endtrans %}<p>
{% endif %}
</div>
{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion ckan/templates/package/snippets/resource_item.html
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
{% if can_edit %}
<li>{% link_for _('Edit resource'), named_route=pkg.type ~ '_resource.edit', id=pkg.name, resource_id=res.id, class_='dropdown-item', icon='pencil' %}</li>
{% block resource_item_explore_inner scoped %}{% endblock %}
<li>{% link_for _('Views'), named_route=pkg.type ~ '_resource.views', id=pkg.name, resource_id=res.id, class_='dropdown-item', icon='chart-bar' %}
<li>{% link_for _('Views'), named_route=pkg.type ~ '_resource.views', id=pkg.name, resource_id=res.id, class_='dropdown-item', icon='chart-bar' %}</li>
{% endif %}
{% endblock %}
</ul>
Expand Down
2 changes: 1 addition & 1 deletion ckanext/datastore/templates/package/resource_read.html
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ <h2>{{ _('Data Dictionary') }}</h2>
{% block action_manage_inner %}
{{ super() }}
{% if res.datastore_active %}
<li>{% link_for _('Data Dictionary'), named_route='datastore.dictionary', id=pkg.name, resource_id=res.id, class_='btn btn-default', icon='code' %}
<li>{% link_for _('Data Dictionary'), named_route='datastore.dictionary', id=pkg.name, resource_id=res.id, class_='btn btn-default', icon='code' %}</li>
{% endif %}
{% endblock %}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
{% block resource_item_explore_inner %}
{{ super() }}
{% if res.datastore_active %}
<li>{% link_for _('Data Dictionary'), named_route='datastore.dictionary', id=pkg.name, resource_id=res.id, class_='dropdown-item', icon='code' %}
<li>{% link_for _('Data Dictionary'), named_route='datastore.dictionary', id=pkg.name, resource_id=res.id, class_='dropdown-item', icon='code' %}</li>
{% endif %}
{% endblock %}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
{% block resources_list_edit_dropdown_inner %}
{{ super() }}
{% if resource.datastore_active %}
<li>{% link_for _('Data Dictionary'), named_route='datastore.dictionary', id=pkg.name, resource_id=resource.id, class_='dropdown-item', icon='code' %}
<li>{% link_for _('Data Dictionary'), named_route='datastore.dictionary', id=pkg.name, resource_id=resource.id, class_='dropdown-item', icon='code' %}</li>
{% endif %}
{% endblock %}

0 comments on commit f255092

Please sign in to comment.