Add owner to list of collections.

When listing the collections, that a media is contained in,
also show the owner of the collection.

Also simplify the whole looping a lot.

1 files changed, 7 insertions, 11 deletions

diff --git a/mediagoblin/templates/mediagoblin/utils/collections.html b/mediagoblin/templates/mediagoblin/utils/collections.html
index 2cff7a29..69738e26 100644
--- a/mediagoblin/templates/mediagoblin/utils/collections.html
+++ b/mediagoblin/templates/mediagoblin/utils/collections.html
@@ -21,17 +21,13 @@
     <h3>{% trans %}Collected in{% endtrans %}</h3>
     <p>
       {%- for collection in media.collections %}
-        {% if loop.last %}
-          {# the 'and' should only appear if there is more than one collections #}
-          {% if media.collections|length > 1 %}
-            &middot;
-          {% endif %}
-          <a href="{{ collection.url_for_self(request.urlgen) }}">{{ collection['title'] }}</a>
-        {% elif loop.revindex == 2 %}
-          <a href="{{ collection.url_for_self(request.urlgen) }}">{{ collection['title'] }}</a>
-        {% else %}
-          <a href="{{ collection.url_for_self(request.urlgen) }}">{{ collection['title'] }}</a> &middot;
-        {% endif %}
+        {%- if not loop.first %}
+          &middot;
+        {%- endif %}
+        <a href="{{ collection.url_for_self(request.urlgen) }}">
+          {{- collection.title }} (
+            {{- collection.get_creator.username -}}
+          )</a>
       {%- endfor %}
     </p>
   {%- endif %}