moved fetching channels to an assignment tag, removed channels args f…

…rom views.
dhedegaard · Jul 6, 2015 · ed8cf6d · ed8cf6d
1 parent 57a7d60
commit ed8cf6d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/youtube/templates/youtube/base.html b/youtube/templates/youtube/base.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 {% load static %}
+{% load youtubetags %}
 <html lang="en">
     <head>
         <meta charset="utf-8">
@@ -42,6 +43,7 @@
                     </div>
                     {% endif %}
                     <ul class="nav navbar-nav">
+                        {% visible_channels as channels %}
                         {% if channels %}
                         <li class="dropdown{% if page == 'channel' %} active{% endif %}">
                             <a href="#" class="dropdown-toggle" data-toggle="dropdown"

diff --git a/youtube/templatetags/youtubetags.py b/youtube/templatetags/youtubetags.py
@@ -0,0 +1,10 @@
+from django import template
+
+from ..models import Channel
+
+register = template.Library()
+
+
+@register.assignment_tag
+def visible_channels():
+    return Channel.objects.filter(hidden=False).order_by('title')
diff --git a/youtube/views.py b/youtube/views.py
@@ -15,9 +15,6 @@ def index(request):
                    filter(uploader__hidden=False).
                    exclude_deleted().
                    prefetch_related('uploader')),
-        'channels': (Channel.objects.
-                     filter(hidden=False).
-                     order_by('title')),
     })
 
 
@@ -27,17 +24,13 @@ def channel(request, author):
                                 filter(hidden=False), author=author)
     return render(request, 'youtube/index.html', {
         'videos': channel.videos.exclude_deleted(),
-        'channels': Channel.objects.filter(hidden=False).order_by('title'),
     })
 
 
 @login_required
 def admin(request):
     form = AddChannelForm(request.POST or None)
     return render(request, 'youtube/admin.html', {
-        'channels': (Channel.objects.
-                     filter(hidden=False).
-                     order_by('title')),
         'admin_channels': (Channel.objects.
                            prefetch_related('videos').
                            order_by('hidden', 'title')),