3 files changed, 72 insertions, 8 deletions
diff --git a/mediagoblin/user_pages/forms.py b/mediagoblin/user_pages/forms.py
new file mode 100644
index 00000000..9f7d2fbd
--- /dev/null
+++ b/mediagoblin/user_pages/forms.py
@@ -0,0 +1,21 @@
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011 Free Software Foundation, Inc
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import wtforms
+
+class MediaCommentForm(wtforms.Form):
+	comment = wtforms.TextAreaField('Comment',
+    	[wtforms.validators.Required()])
+\ No newline at end of file
diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py
index 92998726..255b6f66 100644
--- a/mediagoblin/user_pages/routing.py
+++ b/mediagoblin/user_pages/routing.py
@@ -27,4 +27,7 @@ user_routes = [
     Route('mediagoblin.edit.edit_media', "/{user}/m/{media}/edit/",
         controller="mediagoblin.edit.views:edit_media"),
     Route('mediagoblin.user_pages.atom_feed', '/{user}/atom/',
-        controller="mediagoblin.user_pages.views:atom_feed")]
+        controller="mediagoblin.user_pages.views:atom_feed"),
+    Route('mediagoblin.user_pages.media_post_comment',
+          '/{user}/m/{media}/comment/add/',
+          controller="mediagoblin.user_pages.views:media_post_comment")]
diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py
index d6cd6034..399d2020 100644
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -15,13 +15,19 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from webob import exc
-from mediagoblin.db.util import DESCENDING
-from mediagoblin.util import Pagination, render_to_response
 
-from mediagoblin.decorators import uses_pagination, get_user_media_entry
+from mediagoblin import messages
+from mediagoblin.db.util import DESCENDING, ObjectId
+from mediagoblin.util import (
+    Pagination, render_to_response, redirect, cleaned_markdown_conversion)
+from mediagoblin.user_pages import forms as user_forms
+
+from mediagoblin.decorators import uses_pagination, get_user_media_entry, \
+    require_active_login
 
 from werkzeug.contrib.atom import AtomFeed
 
+
 @uses_pagination
 def user_home(request, page):
     """'Homepage' of a User()"""
@@ -78,12 +84,46 @@ def user_gallery(request, page):
 
 
 @get_user_media_entry
-def media_home(request, media):
-    """'Homepage' of a MediaEntry()"""
+@uses_pagination
+def media_home(request, media, **kwargs):
+    """
+    'Homepage' of a MediaEntry()
+    """
+
+    comment_form = user_forms.MediaCommentForm(request.POST)
+
+    (comments, pagination) = media.get_comments(kwargs.get('page'))
+
     return render_to_response(
         request,
         'mediagoblin/user_pages/media.html',
-        {'media': media})
+        {'media': media,
+         'comments': comments,
+         'pagination': pagination,
+         'comment_form': comment_form})
+
+
+@require_active_login
+def media_post_comment(request):
+    """
+    recieves POST from a MediaEntry() comment form, saves the comment.
+    """
+    comment = request.db.MediaComment()
+    comment['media_entry'] = ObjectId(request.matchdict['media'])
+    comment['author'] = request.user['_id']
+    comment['content'] = request.POST['comment']
+
+    comment['content_html'] = cleaned_markdown_conversion(comment['content'])
+
+    comment.save()
+
+    messages.add_message(
+        request, messages.SUCCESS,
+        'Comment posted!')
+
+    return redirect(request, 'mediagoblin.user_pages.media_home',
+        media = request.matchdict['media'],
+        user = request.matchdict['user'])
 
 
 ATOM_DEFAULT_NR_OF_UPDATED_ITEMS = 5
@@ -117,4 +157,4 @@ def atom_feed(request):
             updated=entry.get('created'),
             url=entry.url_for_self(request.urlgen))
 
-    return feed.get_response() 
+    return feed.get_response()