Fix grouping of episodes when merging podcasts

gpodder · Aug 8, 2017 · be2199d · be2199d
1 parent b9d5829
commit be2199d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/mygpo/administration/templates/admin/merge-grouping.html b/mygpo/administration/templates/admin/merge-grouping.html
@@ -46,8 +46,8 @@ <h1>{% trans "Merge Podcasts and Episodes" %}</h1>
      {% for podcast in podcasts %}
      <td>
       {% for episode in episodes %}
-       {% if episode.podcast == podcast.get_id %}
-        <input type="text" name="episode_{% get_id episode %}" value="{{ n }}" size="2"/>
+       {% if episode.podcast.get_id == podcast.get_id %}
+        <input type="text" name="episode_{{ gepisode.id }}" value="{{ n }}" size="2"/>
         {% episode_link episode podcast %}<br />
        {% endif %}
       {% endfor %}

diff --git 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)