Fix bug with tag slugs
parent
7c8de00658
commit
a5cc98d507
|
@ -3,7 +3,7 @@
|
||||||
{% block breadcrumb %}
|
{% block breadcrumb %}
|
||||||
<li><a href="/public/">public</a></li>
|
<li><a href="/public/">public</a></li>
|
||||||
{% if tag %}
|
{% if tag %}
|
||||||
<li>/ <a href="/public/tag/{{ tag }}/">{{ tag }}</a></li>
|
<li>/ <a href="/public/tag/{{ tag.slug }}/">{{ tag.name }}</a></li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
{% block breadcrumb %}
|
{% block breadcrumb %}
|
||||||
<li><a href="/{{ user.username }}/">{{ user.username }}</a></li>
|
<li><a href="/{{ user.username }}/">{{ user.username }}</a></li>
|
||||||
{% if tag %}
|
{% if tag %}
|
||||||
<li>/ <a href="/{{ user.username }}/tag/{{ tag }}/">{{ tag }}</a></li>
|
<li>/ <a href="/{{ user.username }}/tag/{{ tag.slug }}/">{{ tag.name }}</a></li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
|
|
|
@ -24,14 +24,15 @@ def list_public(request, tag_slug=None):
|
||||||
snipts = Snipt.objects.filter(public=True).order_by('-created')
|
snipts = Snipt.objects.filter(public=True).order_by('-created')
|
||||||
|
|
||||||
if tag_slug:
|
if tag_slug:
|
||||||
snipts = snipts.filter(tags__name__in=[tag_slug])
|
snipts = snipts.filter(tags__slug__in=[tag_slug])
|
||||||
|
tag = get_object_or_404(Tag, slug=tag_slug)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'has_snipts': True,
|
'has_snipts': True,
|
||||||
'public': True,
|
'public': True,
|
||||||
'snipts': snipts,
|
'snipts': snipts,
|
||||||
'tags': tags,
|
'tags': tags,
|
||||||
'tag': tag_slug,
|
'tag': tag,
|
||||||
}
|
}
|
||||||
|
|
||||||
@render_to('snipts/list-user.html')
|
@render_to('snipts/list-user.html')
|
||||||
|
@ -58,14 +59,15 @@ def list_user(request, username, tag_slug=None):
|
||||||
snipts = snipts.order_by('-created')
|
snipts = snipts.order_by('-created')
|
||||||
|
|
||||||
if tag_slug:
|
if tag_slug:
|
||||||
snipts = snipts.filter(tags__name__in=[tag_slug])
|
snipts = snipts.filter(tags__slug__in=[tag_slug])
|
||||||
|
tag = get_object_or_404(Tag, slug=tag_slug)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'has_snipts': True,
|
'has_snipts': True,
|
||||||
'public': public,
|
'public': public,
|
||||||
'snipts': snipts,
|
'snipts': snipts,
|
||||||
'tags': tags,
|
'tags': tags,
|
||||||
'tag': tag_slug,
|
'tag': tag,
|
||||||
'user': user,
|
'user': user,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue