projects
/
matthijs
/
projects
/
xerxes.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dec395d
)
Disallow staff to set the markup of new comments.
author
Matthijs Kooijman
<matthijs@stdin.nl>
Fri, 31 Oct 2008 19:51:54 +0000
(20:51 +0100)
committer
Matthijs Kooijman
<matthijs@stdin.nl>
Fri, 31 Oct 2008 19:51:54 +0000
(20:51 +0100)
influences/forms.py
patch
|
blob
|
history
diff --git
a/influences/forms.py
b/influences/forms.py
index 7a222e2324daaa2087b8a3efa91cdfaf621d3d5a..b9416f9d590dc5238b1615a4cefa13b70445e623 100644
(file)
--- a/
influences/forms.py
+++ b/
influences/forms.py
@@
-22,17
+22,22
@@
class AdminInfluenceCommentForm(ThreadedCommentForm):
class Meta(ThreadedCommentForm.Meta):
fields = ThreadedCommentForm.Meta.fields + ('is_public',)
class Meta(ThreadedCommentForm.Meta):
fields = ThreadedCommentForm.Meta.fields + ('is_public',)
+ exclude = ('markup', )
class AdminPrivateInfluenceCommentForm(ThreadedCommentForm):
def __init__(self, *args, **kwargs):
super(AdminPrivateInfluenceCommentForm, self).__init__(*args, **kwargs)
self.instance.is_public = False
class AdminPrivateInfluenceCommentForm(ThreadedCommentForm):
def __init__(self, *args, **kwargs):
super(AdminPrivateInfluenceCommentForm, self).__init__(*args, **kwargs)
self.instance.is_public = False
+ class Meta(ThreadedCommentForm.Meta):
+ exclude = ('markup', )
+
def get_influence_comment_form(is_staff, reply_to):
""" Gets the form class that a user can use to reply to the given comment.
reply_to can be None, in which case the form class for a new comment is
returned. """
def get_influence_comment_form(is_staff, reply_to):
""" Gets the form class that a user can use to reply to the given comment.
reply_to can be None, in which case the form class for a new comment is
returned. """
- allow_markup = allow_private = is_staff
+ allow_markup = False
+ allow_private = is_staff
if reply_to:
allow_public = reply_to.is_public
else:
if reply_to:
allow_public = reply_to.is_public
else:
@@
-43,9
+48,9
@@
def _get_influence_comment_form(allow_markup, allow_public, allow_private):
""" Internal wrapper that selects the right form class depending on the
given options. Should not be called directly, call
get_influence_comment_form instead. """
""" Internal wrapper that selects the right form class depending on the
given options. Should not be called directly, call
get_influence_comment_form instead. """
- if allow_markup and allow_public and allow_private:
+ if
not
allow_markup and allow_public and allow_private:
return AdminInfluenceCommentForm
return AdminInfluenceCommentForm
- elif allow_markup and not allow_public and allow_private:
+ elif
not
allow_markup and not allow_public and allow_private:
return AdminPrivateInfluenceCommentForm
elif not allow_markup and allow_public and not allow_private:
return InfluenceCommentForm
return AdminPrivateInfluenceCommentForm
elif not allow_markup and allow_public and not allow_private:
return InfluenceCommentForm