Skip to content

Commit

Permalink
Merge pull request #2618 from ckan/2609-delete-related-items-frontend
Browse files Browse the repository at this point in the history
Removes the front-end parts of related items.
  • Loading branch information
David Read committed Sep 7, 2015
2 parents 9026c30 + 92692e7 commit 485e607
Show file tree
Hide file tree
Showing 16 changed files with 1 addition and 583 deletions.
11 changes: 0 additions & 11 deletions ckan/config/routing.py
Expand Up @@ -194,17 +194,6 @@ def make_map():
map.redirect('/package', '/dataset')
map.redirect('/package/{url:.*}', '/dataset/{url}')

with SubMapper(map, controller='related') as m:
m.connect('related_new', '/dataset/{id}/related/new', action='new')
m.connect('related_edit', '/dataset/{id}/related/edit/{related_id}',
action='edit')
m.connect('related_delete', '/dataset/{id}/related/delete/{related_id}',
action='delete')
m.connect('related_list', '/dataset/{id}/related', action='list',
ckan_icon='picture')
m.connect('related_read', '/related/{id}', action='read')
m.connect('related_dashboard', '/related', action='dashboard')

with SubMapper(map, controller='package') as m:
m.connect('search', '/dataset', action='search',
highlight_actions='index search')
Expand Down
238 changes: 0 additions & 238 deletions ckan/controllers/related.py

This file was deleted.

2 changes: 0 additions & 2 deletions ckan/public/base/test/index.html
Expand Up @@ -48,7 +48,6 @@
<script src="../javascript/modules/resource-upload-field.js"></script>
<script src="../javascript/modules/confirm-action.js"></script>
<script src="../javascript/modules/custom-fields.js"></script>
<script src="../javascript/modules/related-item.js"></script>

<!-- Suite -->
<script src="./spec/ckan.spec.js"></script>
Expand All @@ -64,7 +63,6 @@
<script src="./spec/modules/basic-form.spec.js"></script>
<script src="./spec/modules/autocomplete.spec.js"></script>
<script src="./spec/modules/custom-fields.spec.js"></script>
<script src="./spec/modules/related-item.spec.js"></script>
<script src="./spec/plugins/jquery.inherit.spec.js"></script>
<script src="./spec/plugins/jquery.proxy-all.spec.js"></script>
<script src="./spec/plugins/jquery.url-helpers.spec.js"></script>
Expand Down
2 changes: 0 additions & 2 deletions ckan/templates/ajax_snippets/related-item.html

This file was deleted.

6 changes: 0 additions & 6 deletions ckan/templates/home/snippets/stats.html
Expand Up @@ -23,12 +23,6 @@ <h3>{{ _('{0} statistics').format(g.site_title) }}</h3>
{{ _('group') if stats.group_count == 1 else _('groups') }}
</a>
</li>
<li>
<a href="{{ h.url_for(controller='related', action='dashboard') }}">
<b>{{ h.SI_number_span(stats.related_count) }}</b>
{{ _('related item') if stats.related_count == 1 else _('related items') }}
</a>
</li>
{% endblock %}
</ul>
</div>
Expand Down
1 change: 0 additions & 1 deletion ckan/templates/package/read_base.html
Expand Up @@ -19,7 +19,6 @@
{{ h.build_nav_icon('dataset_read', _('Dataset'), id=pkg.name) }}
{{ h.build_nav_icon('dataset_groups', _('Groups'), id=pkg.name) }}
{{ h.build_nav_icon('dataset_activity', _('Activity Stream'), id=pkg.name) }}
{{ h.build_nav_icon('related_list', _('Related'), id=pkg.name) }}
{% endblock %}

{% block primary_content_inner %}
Expand Down
32 changes: 0 additions & 32 deletions ckan/templates/related/base_form_page.html

This file was deleted.

21 changes: 0 additions & 21 deletions ckan/templates/related/confirm_delete.html

This file was deleted.

0 comments on commit 485e607

Please sign in to comment.