Michael Hall has proposed merging lp:~mhall119/loco-directory/move-renderablemixin into lp:loco-directory.
Requested reviews: loco-directory-dev (loco-directory-dev) Moves daker's new RenderableMixin out of common.utils and into common.forms -- https://code.launchpad.net/~mhall119/loco-directory/move-renderablemixin/+merge/39059 Your team loco-directory-dev is requested to review the proposed merge of lp:~mhall119/loco-directory/move-renderablemixin into lp:loco-directory.
=== added file 'loco_directory/common/forms.py' --- loco_directory/common/forms.py 1970-01-01 00:00:00 +0000 +++ loco_directory/common/forms.py 2010-10-21 16:16:04 +0000 @@ -0,0 +1,41 @@ +from django.template import Context, loader +from django import forms + +# Taken from http://djangosnippets.org/snippets/1732/ +class RenderableMixin(object): + """ + Mixin to render forms from a predefined template + """ + + @property + def form_class_name(self): + return '.'.join([self.__module__, self.__class__.__name__.lower()]) + + def as_template(self): + """ + Renders a form from a template + """ + self.template_name = self.__class__.__name__.lower() + + if not getattr(self, 'tpl', None): + self.tpl = loader.get_template('form.html') + + context_dict = dict( + non_field_errors=self.non_field_errors(), + fields=[ forms.forms.BoundField(self, field, name) for name, field in self.fields.iteritems()], + errors=self.errors, + data=self.data, + form=self, + ) + + if getattr(self, 'initial', None): + context_dict.update(dict(initial=self.initial)) + if getattr(self, 'instance', None): + context_dict.update(dict(instance=self.instance)) + if getattr(self, 'cleaned_data', None): + context_dict.update(dict(cleaned_data=self.cleaned_data)) + + return self.tpl.render( + Context(context_dict) + ) + === modified file 'loco_directory/common/utils.py' --- loco_directory/common/utils.py 2010-10-08 21:43:14 +0000 +++ loco_directory/common/utils.py 2010-10-21 16:16:04 +0000 @@ -104,41 +104,4 @@ self.index = -1 return '' -# Taken from http://djangosnippets.org/snippets/1732/ -class RenderableMixin(object): - """ - Mixin to render forms from a predefined template - """ - - @property - def form_class_name(self): - return '.'.join([self.__module__, self.__class__.__name__.lower()]) - - def as_template(self): - """ - Renders a form from a template - """ - self.template_name = self.__class__.__name__.lower() - - if not getattr(self, 'tpl', None): - self.tpl = loader.get_template('form.html') - - context_dict = dict( - non_field_errors=self.non_field_errors(), - fields=[ forms.forms.BoundField(self, field, name) for name, field in self.fields.iteritems()], - errors=self.errors, - data=self.data, - form=self, - ) - - if getattr(self, 'initial', None): - context_dict.update(dict(initial=self.initial)) - if getattr(self, 'instance', None): - context_dict.update(dict(instance=self.instance)) - if getattr(self, 'cleaned_data', None): - context_dict.update(dict(cleaned_data=self.cleaned_data)) - - return self.tpl.render( - Context(context_dict) - ) - + === modified file 'loco_directory/events/forms.py' --- loco_directory/events/forms.py 2010-10-08 21:43:14 +0000 +++ loco_directory/events/forms.py 2010-10-21 16:16:04 +0000 @@ -6,7 +6,7 @@ from models import BaseEvent, GlobalEvent, TeamEvent, Attendee, TeamEventComment from venues.models import Venue -from common.utils import RenderableMixin +from common.forms import RenderableMixin def validate_tag(tag): if tag.startswith('#'): === modified file 'loco_directory/teams/forms.py' --- loco_directory/teams/forms.py 2010-10-21 15:45:21 +0000 +++ loco_directory/teams/forms.py 2010-10-21 16:16:04 +0000 @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from models import Team -from common.utils import RenderableMixin +from common.forms import RenderableMixin class UpdateTeamForm(forms.ModelForm, RenderableMixin): class Meta: @@ -24,6 +24,14 @@ model = Team exclude = ('approved', 'expires_date', 'name', 'lp_name', 'admins', 'owner', 'active') + class Media: + css = {'all': ( + '/media/css/colortip-1.0-jquery.css', + )} + js = ( + '/media/js/colortip-1.0-jquery.js', + ) + class TeamSearchForm(forms.Form): """ A Search form for teams === modified file 'loco_directory/venues/forms.py' --- loco_directory/venues/forms.py 2010-10-21 15:45:21 +0000 +++ loco_directory/venues/forms.py 2010-10-21 16:16:04 +0000 @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from models import Venue -from common.utils import RenderableMixin +from common.forms import RenderableMixin from django.conf import settings try:
_______________________________________________ Mailing list: https://launchpad.net/~loco-directory-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~loco-directory-dev More help : https://help.launchpad.net/ListHelp
