aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/user_pages/views.py
diff options
context:
space:
mode:
authorJessica Tallon <jessica@megworld.co.uk>2015-01-12 13:42:02 +0000
committerJessica Tallon <jessica@megworld.co.uk>2015-02-15 17:17:01 +0100
commit4fd520364f7d2405d09ac0d6bf561285356e4adb (patch)
tree147a144115c0ac858170e5280ff69c97bff4761e /mediagoblin/user_pages/views.py
parent4aaa7fac14ade38fa12fe4ee1d4af3b57e1d993f (diff)
downloadmediagoblin-4fd520364f7d2405d09ac0d6bf561285356e4adb.tar.lz
mediagoblin-4fd520364f7d2405d09ac0d6bf561285356e4adb.tar.xz
mediagoblin-4fd520364f7d2405d09ac0d6bf561285356e4adb.zip
Change 'federation' name to 'api' which is more suitable
Diffstat (limited to 'mediagoblin/user_pages/views.py')
-rw-r--r--mediagoblin/user_pages/views.py33
1 files changed, 32 insertions, 1 deletions
diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py
index 822f359a..cc7f3684 100644
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -22,7 +22,7 @@ import six
from mediagoblin import messages, mg_globals
from mediagoblin.db.models import (MediaEntry, MediaTag, Collection,
- CollectionItem, User)
+ CollectionItem, User, Activity)
from mediagoblin.tools.response import render_to_response, render_404, \
redirect, redirect_obj
from mediagoblin.tools.text import cleaned_markdown_conversion
@@ -695,3 +695,34 @@ def file_a_report(request, media, comment):
request,
'mediagoblin/user_pages/report.html',
context)
+
+@require_active_login
+def activity_view(request):
+ """ /<username>/activity/<id> - Display activity
+
+ This should display a HTML presentation of the activity
+ this is NOT an API endpoint.
+ """
+ # Get the user object.
+ username = request.matchdict["username"]
+ user = User.query.filter_by(username=username).first()
+
+ activity_id = request.matchdict["id"]
+
+ if request.user is None:
+ return render_404(request)
+
+ activity = Activity.query.filter_by(
+ id=activity_id,
+ author=user.id
+ ).first()
+
+ if activity is None:
+ return render_404(request)
+
+ return render_to_response(
+ request,
+ "mediagoblin/api/activity.html",
+ {"activity": activity}
+ )
+