[#1491] Fix new dataset form and resource pages breadcrumbs

ckan · Feb 3, 2014 · 2bd5465 · 2bd5465
1 parent f49cb0a
commit 2bd5465
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/ckan/templates/package/edit_base.html b/ckan/templates/package/edit_base.html
@@ -7,7 +7,9 @@
 
 {% block breadcrumb_content %}
   {{ super() }}
-  <li class="active">{% link_for _('Edit'), controller='package', action='edit', id=pkg.name %}</li>
+  {% if pkg %}
+    <li class="active">{% link_for _('Edit'), controller='package', action='edit', id=pkg.name %}</li>
+  {% endif %}
 {% endblock %}
 
 {% block content_action %}

diff --git a/ckan/templates/package/new_resource.html b/ckan/templates/package/new_resource.html
@@ -7,7 +7,9 @@
 {% block breadcrumb_content_selected %}{% endblock %}
 {% block breadcrumb_content %}
   {{ super() }}
-  <li class="active"><a href="#">{{ _('Add New Resource') }}</a></li>
+  {% if pkg %}
+    <li class="active"><a href="#">{{ _('Add New Resource') }}</a></li>
+  {% endif %}
 {% endblock %}
 
 {% block form %}{% snippet 'package/snippets/resource_form.html', data=data, errors=errors, error_summary=error_summary, include_metadata=false, pkg_name=pkg_name, stage=stage, allow_upload=g.ofs_impl and logged_in %}{% endblock %}

diff --git a/ckan/templates/package/new_resource_not_draft.html b/ckan/templates/package/new_resource_not_draft.html
@@ -4,6 +4,7 @@
 {% block form_title %}{{ _('Add resource') }}{% endblock %}
 
 {% block breadcrumb_content %}
+  {{ super() }}
   <li class="active"><a href="#">{{ _('Add New Resource') }}</a></li>
 {% endblock %}
 

diff --git a/ckan/templates/package/resource_edit_base.html b/ckan/templates/package/resource_edit_base.html
@@ -7,8 +7,10 @@
 
 {% block breadcrumb_content %}
   {{ super() }}
-  <li>{% link_for h.resource_display_name(res)|truncate(30), controller='package', action='resource_read', id=pkg.name, resource_id=res.id %}</li>
-  <li class="active"><a href="">{{ _('Edit') }}</a></li>
+  {% if res %}
+    <li>{% link_for h.resource_display_name(res)|truncate(30), controller='package', action='resource_read', id=pkg.name, resource_id=res.id %}</li>
+    <li class="active"><a href="">{{ _('Edit') }}</a></li>
+  {% endif %}
 {% endblock %}
 
 {% block content_action %}