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

Updated MediaCommentForm.field_comment => MediaCommentForm.comment_content

Browse Source 
*   Also changed file encoding of `user_pages/forms.py` from dos to unix.
This commit is contained in:
Joar Wandborg 2011-07-07 22:45:51 +02:00
parent af2fcba5c4
commit f646f5d36d
3 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,7 +55,7 @@
<form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment', <form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment',
user= media.uploader().username, user= media.uploader().username,
media=media._id) }}" method="POST"> media=media._id) }}" method="POST">
{{ wtforms_util.render_field_div(comment_form.field_comment) }} {{ wtforms_util.render_field_div(comment_form.comment_content) }}
<div class="form_submit_buttons"> <div class="form_submit_buttons">
<input type="submit" value="Post comment!" class="button" /> <input type="submit" value="Post comment!" class="button" />
</div> </div>

43
mediagoblin/user_pages/forms.py
View File

@ -1,21 +1,22 @@
# GNU MediaGoblin -- federated, autonomous media hosting # GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2011 Free Software Foundation, Inc # Copyright (C) 2011 Free Software Foundation, Inc
# #
# This program is free software: you can redistribute it and/or modify # 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 # 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 # the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version. # (at your option) any later version.
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details. # GNU Affero General Public License for more details.
# #
# You should have received a copy of the GNU Affero General Public License # 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/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import wtforms import wtforms
class MediaCommentForm(wtforms.Form): class MediaCommentForm(wtforms.Form):
field_comment = wtforms.TextAreaField('Comment', comment_content = wtforms.TextAreaField(
[wtforms.validators.Required()]) 'Comment',
[wtforms.validators.Required()])

2
mediagoblin/user_pages/views.py
View File

@ -124,7 +124,7 @@ def media_post_comment(request):
comment = request.db.MediaComment() comment = request.db.MediaComment()
comment['media_entry'] = ObjectId(request.matchdict['media']) comment['media_entry'] = ObjectId(request.matchdict['media'])
comment['author'] = request.user['_id'] comment['author'] = request.user['_id']
comment['content'] = request.POST['field_comment'] comment['content'] = request.POST['comment_content']
comment['content_html'] = cleaned_markdown_conversion(comment['content']) comment['content_html'] = cleaned_markdown_conversion(comment['content'])