diff --git a/mygpo/administration/templates/admin/merge-grouping.html b/mygpo/administration/templates/admin/merge-grouping.html index 94a5c8dae..f8e0d2a47 100644 --- a/mygpo/administration/templates/admin/merge-grouping.html +++ b/mygpo/administration/templates/admin/merge-grouping.html @@ -46,8 +46,8 @@

{% trans "Merge Podcasts and Episodes" %}

{% for podcast in podcasts %} {% for episode in episodes %} - {% if episode.podcast == podcast.get_id %} - + {% if episode.podcast.get_id == podcast.get_id %} + {% episode_link episode podcast %}
{% endif %} {% endfor %} diff --git a/mygpo/web/templatetags/episodes.py b/mygpo/web/templatetags/episodes.py index 1c6d432a0..59718745c 100644 --- a/mygpo/web/templatetags/episodes.py +++ b/mygpo/web/templatetags/episodes.py @@ -132,11 +132,6 @@ def episode_link(episode, podcast, title=None): title=title) -@register.simple_tag -def get_id(obj): - return obj._id - - @register.simple_tag def episode_number(episode, podcast): num = episode.get_episode_number(podcast.common_episode_title)