From 0cc5c005cc3e24e3859fe00edfa01f560025a7ee Mon Sep 17 00:00:00 2001 From: Matthijs Kooijman Date: Fri, 31 Oct 2008 11:49:14 +0100 Subject: [PATCH] Move forms from models.py to a new file forms.py. --- influences/forms.py | 64 +++++++++++++++++++++++++++++++++++++++++++++ influences/views.py | 63 +------------------------------------------- 2 files changed, 65 insertions(+), 62 deletions(-) create mode 100644 influences/forms.py diff --git a/influences/forms.py b/influences/forms.py new file mode 100644 index 0000000..7a222e2 --- /dev/null +++ b/influences/forms.py @@ -0,0 +1,64 @@ +from threadedcomments.forms import ThreadedCommentForm +from xerxes.tools.forms import ContextModelForm +from models import Influence, Character + +# +# A few comment form classes, to handle the various cases (staff/no staff, +# reply to public/private post) +# +# It is probably possible to reduce this mess a bit using metaclasses, but I +# didn't get this to work yet. +# +class InfluenceCommentForm(ThreadedCommentForm): + def __init__(self, *args, **kwargs): + super(InfluenceCommentForm, self).__init__(*args, **kwargs) + + class Meta(ThreadedCommentForm.Meta): + exclude = ('markup', ) + +class AdminInfluenceCommentForm(ThreadedCommentForm): + def __init__(self, *args, **kwargs): + super(AdminInfluenceCommentForm, self).__init__(*args, **kwargs) + + class Meta(ThreadedCommentForm.Meta): + fields = ThreadedCommentForm.Meta.fields + ('is_public',) + +class AdminPrivateInfluenceCommentForm(ThreadedCommentForm): + def __init__(self, *args, **kwargs): + super(AdminPrivateInfluenceCommentForm, self).__init__(*args, **kwargs) + self.instance.is_public = False + +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 + if reply_to: + allow_public = reply_to.is_public + else: + allow_public = True + return _get_influence_comment_form(allow_markup, allow_public, allow_private) + +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. """ + if allow_markup and allow_public and allow_private: + return AdminInfluenceCommentForm + elif allow_markup and not allow_public and allow_private: + return AdminPrivateInfluenceCommentForm + elif not allow_markup and allow_public and not allow_private: + return InfluenceCommentForm + else: + raise Exception("Unsupported configuration") + +class InfluenceForm(ContextModelForm): + class Meta: + model = Influence + fields = ('character', 'contact', 'summary', 'description') + +class CharacterForm(ContextModelForm): + class Meta: + model = Character + fields = ('name') + diff --git a/influences/views.py b/influences/views.py index cbef4fb..b49b100 100644 --- a/influences/views.py +++ b/influences/views.py @@ -10,71 +10,10 @@ from django.core.urlresolvers import reverse from django.http import HttpResponseRedirect, HttpResponseForbidden from django.views.generic.list_detail import object_detail, object_list from threadedcomments.models import ThreadedComment -from threadedcomments.forms import ThreadedCommentForm from threadedcomments.views import free_comment from xerxes.influences.models import Character from xerxes.influences.models import Influence -from xerxes.tools.forms import ContextModelForm - -# -# A few comment form classes, to handle the various cases (staff/no staff, -# reply to public/private post) -# -# It is probably possible to reduce this mess a bit using metaclasses, but I -# didn't get this to work yet. -# -class InfluenceCommentForm(ThreadedCommentForm): - def __init__(self, *args, **kwargs): - super(InfluenceCommentForm, self).__init__(*args, **kwargs) - - class Meta(ThreadedCommentForm.Meta): - exclude = ('markup', ) - -class AdminInfluenceCommentForm(ThreadedCommentForm): - def __init__(self, *args, **kwargs): - super(AdminInfluenceCommentForm, self).__init__(*args, **kwargs) - - class Meta(ThreadedCommentForm.Meta): - fields = ThreadedCommentForm.Meta.fields + ('is_public',) - -class AdminPrivateInfluenceCommentForm(ThreadedCommentForm): - def __init__(self, *args, **kwargs): - super(AdminPrivateInfluenceCommentForm, self).__init__(*args, **kwargs) - self.instance.is_public = False - -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 - if reply_to: - allow_public = reply_to.is_public - else: - allow_public = True - return _get_influence_comment_form(allow_markup, allow_public, allow_private) - -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. """ - if allow_markup and allow_public and allow_private: - return AdminInfluenceCommentForm - elif allow_markup and not allow_public and allow_private: - return AdminPrivateInfluenceCommentForm - elif not allow_markup and allow_public and not allow_private: - return InfluenceCommentForm - else: - raise Exception("Unsupported configuration") - -class InfluenceForm(ContextModelForm): - class Meta: - model = Influence - fields = ('character', 'contact', 'summary', 'description') - -class CharacterForm(ContextModelForm): - class Meta: - model = Character - fields = ('name') +from forms import get_influence_comment_form, InfluenceForm, CharacterForm @login_required def add_influence(request, character_id=None): -- 2.30.2