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

added filtering by entry state in processing panel

Browse Source
This commit is contained in:
Boris Bobrov 2014-08-16 17:41:37 +03:00
parent be9262b4d4
commit 906a00b667
4 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mediagoblin/plugins/processing_info/templates/mediagoblin/processing_info/header_left.html
View File

@ -18,15 +18,15 @@
{#This injects some information about entries in processing #}
{% if request.user and request.user.has_privilege('active') %}
{% if num_queued is defined and num_queued != 0 %}
{% set panel_url = request.urlgen('mediagoblin.user_pages.processing_panel',
user=request.user.username) %}
<span class="num_queued status_icon">
<a href="{{ panel_url }}">&#9203; {{ num_queued }}</a>
<a href="{{ request.urlgen('mediagoblin.user_pages.processing_panel',
user=request.user.username, state="processing") }}">&#9203; {{ num_queued }}</a>
</span>
{% endif %}
{% if num_failed is defined and num_failed != 0 %}
<span class="num_failed status_icon">
<a href="{{ panel_url }}">&#9785; {{ num_failed }}</a>
<a href="{{ request.urlgen('mediagoblin.user_pages.processing_panel',
user=request.user.username, state="failed") }}">&#9785; {{ num_failed }}</a>
</span>
{% endif %}
{% endif %}

12
mediagoblin/templates/mediagoblin/user_pages/processing_panel.html
View File

@ -28,6 +28,18 @@
<p>
{% trans %}You can track the state of media being processed for your gallery here.{% endtrans %}
</p>
<p>
Show:
<a href="{{ request.urlgen('mediagoblin.user_pages.processing_panel',
user=request.user.username) }}">All</a>,
<a href="{{ request.urlgen('mediagoblin.user_pages.processing_panel',
user=request.user.username, state="processing") }}">In processing</a>,
<a href="{{ request.urlgen('mediagoblin.user_pages.processing_panel',
user=request.user.username, state="failed") }}">Failed</a>,
<a href="{{ request.urlgen('mediagoblin.user_pages.processing_panel',
user=request.user.username, state="processed") }}">Succesful</a>
</p>
{% if entries.count() %}
<table class="media_panel processing">

5
mediagoblin/user_pages/routing.py
View File

@ -97,6 +97,11 @@ add_route('mediagoblin.user_pages.processing_panel',
'/u/<string:user>/panel/',
'mediagoblin.user_pages.views:processing_panel')
add_route('mediagoblin.user_pages.processing_panel',
'/u/<string:user>/panel/<any(processed, processing, failed):state>/',
'mediagoblin.user_pages.views:processing_panel')
# Stray edit routes
add_route('mediagoblin.edit.edit_media',
'/u/<string:user>/m/<int:media_id>/edit/',

9
mediagoblin/user_pages/views.py
View File

@ -653,11 +653,18 @@ def processing_panel(request):
return redirect(
request, 'mediagoblin.user_pages.user_home',
user=user.username)
# Get media entries which are in-processing
entries = (MediaEntry.query.filter_by(uploader=user.id)
.order_by(MediaEntry.created.desc()))
try:
state = request.matchdict['state']
# no exception was thrown, filter entries by state
entries = entries.filter_by(state=state)
except KeyError:
# show all entries
pass
# Render to response
return render_to_response(
request,