diff options
Diffstat (limited to 'mediagoblin/user_pages')
| -rw-r--r-- | mediagoblin/user_pages/lib.py | 10 | ||||
| -rw-r--r-- | mediagoblin/user_pages/views.py | 11 |
2 files changed, 11 insertions, 10 deletions
diff --git a/mediagoblin/user_pages/lib.py b/mediagoblin/user_pages/lib.py index 7f03fcd3..f29c1796 100644 --- a/mediagoblin/user_pages/lib.py +++ b/mediagoblin/user_pages/lib.py @@ -19,7 +19,7 @@ from mediagoblin.tools.template import render_template from mediagoblin.tools.translate import pass_to_ugettext as _ from mediagoblin import mg_globals from mediagoblin.db.base import Session -from mediagoblin.db.models import (CollectionItem, MediaReport, CommentReport, +from mediagoblin.db.models import (CollectionItem, MediaReport, CommentReport, MediaComment, MediaEntry) from mediagoblin.user_pages import forms as user_forms @@ -80,14 +80,14 @@ def add_media_to_collection(collection, media, note=None, commit=True): def build_report_object(report_form, media_entry=None, comment=None): """ - This function is used to convert a form object (from a User filing a + This function is used to convert a form object (from a User filing a report) into either a MediaReport or CommentReport object. - :param report_form should be a MediaReportForm or a CommentReportForm + :param report_form should be a MediaReportForm or a CommentReportForm object - :param + :param - :returns either of MediaReport or a CommentReport object that has not been + :returns either of MediaReport or a CommentReport object that has not been saved. In case of an improper form_dict, returns None """ diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index 00fcf282..c2d2e66f 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -162,6 +162,7 @@ def media_home(request, media, page, **kwargs): @get_media_entry_by_id @require_active_login +@user_has_privilege(u'commenter') def media_post_comment(request, media): """ recieves POST from a MediaEntry() comment form, saves the comment. @@ -651,13 +652,13 @@ def file_a_report(request, media, comment=None): 'form':form} if request.method == "POST": - report_table = build_report_object(form, - media_entry=media, + report_object = build_report_object(form, + media_entry=media, comment=comment) # if the object was built successfully, report_table will not be None - if report_table: - report_table.save() + if report_object: + report_object.save() return redirect( request, 'index') @@ -671,5 +672,5 @@ def file_a_report(request, media, comment=None): @require_active_login @get_user_media_entry @get_media_comment_by_id -def file_a_comment_report(request, media, comment): +def file_a_comment_report(request, media, comment): return file_a_report(request, comment=comment) |