heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use media.id for collecting media too.

Browse Source 
Also remove some useless whitespace while at it.
This commit is contained in:
Elrond 2013-02-24 16:08:55 +01:00
parent 954b407cf8
commit 96a2249bc0
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mediagoblin/templates/mediagoblin/user_pages/media_collect.html
View File

@ -33,7 +33,7 @@
{% block mediagoblin_content %} {% block mediagoblin_content %}
<form action="{{ request.urlgen('mediagoblin.user_pages.media_collect', <form action="{{ request.urlgen('mediagoblin.user_pages.media_collect',
user=media.get_uploader.username, user=media.get_uploader.username,
media=media.id) }}" media_id=media.id) }}"
method="POST" enctype="multipart/form-data"> method="POST" enctype="multipart/form-data">
<div class="form_box"> <div class="form_box">
<h1> <h1>

12
mediagoblin/templates/mediagoblin/utils/collections.html
View File

@ -20,7 +20,7 @@
{% if media.collections %} {% if media.collections %}
<h3>{% trans %}Collected in{% endtrans %}</h3> <h3>{% trans %}Collected in{% endtrans %}</h3>
<p> <p>
{% for collection in media.collections %} {%- for collection in media.collections %}
{% if loop.last %} {% if loop.last %}
{# the 'and' should only appear if there is more than one collections #} {# the 'and' should only appear if there is more than one collections #}
{% if media.collections|length > 1 %} {% if media.collections|length > 1 %}
@ -32,17 +32,17 @@
{% else %} {% else %}
<a href="{{ collection.url_for_self(request.urlgen) }}">{{ collection['title'] }}</a> &middot; <a href="{{ collection.url_for_self(request.urlgen) }}">{{ collection['title'] }}</a> &middot;
{% endif %} {% endif %}
{% endfor %} {%- endfor %}
</p> </p>
{% endif %} {%- endif %}
{% if request.user %} {%- if request.user %}
<p> <p>
<a type="submit" href="{{ request.urlgen('mediagoblin.user_pages.media_collect', <a type="submit" href="{{ request.urlgen('mediagoblin.user_pages.media_collect',
user=media.get_uploader.username, user=media.get_uploader.username,
media=media.id) }}" media_id=media.id) }}"
class="button_action"> class="button_action">
{% trans %}Add to a collection{% endtrans %} {% trans %}Add to a collection{% endtrans %}
</a> </a>
</p> </p>
{% endif %} {%- endif %}
{% endblock %} {% endblock %}

2
mediagoblin/user_pages/routing.py
View File

@ -50,7 +50,7 @@ add_route('mediagoblin.user_pages.atom_feed',
'mediagoblin.user_pages.views:atom_feed') 'mediagoblin.user_pages.views:atom_feed')
add_route('mediagoblin.user_pages.media_collect', add_route('mediagoblin.user_pages.media_collect',
'/u/<string:user>/m/<string:media>/collect/', '/u/<string:user>/m/<int:media_id>/collect/',
'mediagoblin.user_pages.views:media_collect') 'mediagoblin.user_pages.views:media_collect')
add_route('mediagoblin.user_pages.collection_list', add_route('mediagoblin.user_pages.collection_list',

2
mediagoblin/user_pages/views.py
View File

@ -180,7 +180,7 @@ def media_post_comment(request, media):
return redirect(request, location=media.url_for_self(request.urlgen)) return redirect(request, location=media.url_for_self(request.urlgen))
@get_user_media_entry @get_media_entry_by_id
@require_active_login @require_active_login
def media_collect(request, media): def media_collect(request, media):
"""Add media to collection submission""" """Add media to collection submission"""