tag disambiguation page updated

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index b04cf43..0adce19 100644 (file)
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -79,11 +79,11 @@ def differentiate_tags(request, tags, ambiguous_slugs):
     options = []
     for tag in models.Tag.objects.exclude(category='book').filter(slug=ambiguous_slugs[0]):
         options.append({
     options = []
     for tag in models.Tag.objects.exclude(category='book').filter(slug=ambiguous_slugs[0]):
         options.append({

-            'url_args': '/'.join((beginning, tag.url_chunk, unparsed)).rstrip('/'),
-            'tags': tags + [tag]
+            'url_args': '/'.join((beginning, tag.url_chunk, unparsed)).strip('/'),
+            'tags': [tag]

         })
     return render_to_response('catalogue/differentiate_tags.html',
         })
     return render_to_response('catalogue/differentiate_tags.html',

-                {'tags': tags, 'options': options, 'unparsed': unparsed}, 
+                {'tags': tags, 'options': options, 'unparsed': ambiguous_slugs[1:]}, 

                 context_instance=RequestContext(request))
 
 
                 context_instance=RequestContext(request))
 
 

diff --git a/wolnelektury/templates/catalogue/differentiate_tags.html b/wolnelektury/templates/catalogue/differentiate_tags.html
index 86e34bb..51b3821 100644 (file)
--- a/wolnelektury/templates/catalogue/differentiate_tags.html
+++ b/wolnelektury/templates/catalogue/differentiate_tags.html
@@ -14,7 +14,7 @@
     <div id="books-list">
         {% for option in options %}
         <div class="book-description"
     <div id="books-list">
         {% for option in options %}
         <div class="book-description"

-            <p><a href="{% url tagged_object_list option.url_args %}">{% title_from_tags option.tags %}{% if unparsed %}, &hellip;{% endif %}</a></p>
+            <p><a href="{% url tagged_object_list option.url_args %}">{% if tags %}{% title_from_tags tags %}, {% endif %}<em>{%title_from_tags option.tags %}</em>{% if unparsed %}, {{unparsed|join:', '}}{% endif %}</a></p>

                </div>
         {% endfor %}
     </div>
                </div>
         {% endfor %}
     </div>