diff options
Diffstat (limited to 'chimere/forms.py')
| -rw-r--r-- | chimere/forms.py | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/chimere/forms.py b/chimere/forms.py index 8691fa6..11fafc9 100644 --- a/chimere/forms.py +++ b/chimere/forms.py @@ -121,7 +121,7 @@ def notifyByEmail(subject, body, user_list, sender=None): def notifySubmission(absolute_uri, geo_object): - category = u" - ".join([unicode(cat) + category = u" - ".join([str(cat) for cat in geo_object.categories.all()]) subject = u'%s %s' % (_(u"New submission for"), category) message = _(u'The new item "%s" has been submited in the category: ') % \ @@ -151,6 +151,9 @@ class SubCategoryAdminForm(forms.ModelForm): ''' description = forms.CharField(widget=FullTextareaWidget, required=False) + class Meta: + exclude = [] + class PageAdminForm(forms.ModelForm): """ @@ -160,6 +163,7 @@ class PageAdminForm(forms.ModelForm): class Meta: model = Page + exclude = [] class OSMForm(forms.Form): @@ -189,6 +193,7 @@ class NewsAdminForm(forms.ModelForm): class Meta: model = News + exclude = [] class ImporterAdminForm(forms.ModelForm): @@ -205,6 +210,7 @@ class ImporterAdminForm(forms.ModelForm): 'source': forms.TextInput(attrs={'size': 80}), 'filtr': forms.Textarea(attrs={'size': 80}), } + exclude = [] def clean(self): ''' @@ -254,6 +260,7 @@ class CategoryAdminForm(forms.ModelForm): class Meta: model = Category + exclude = [] def get_properties(queryset): @@ -267,7 +274,7 @@ def get_properties(queryset): ).order_by('value') fields[key] = forms.ChoiceField( label=prop.name, choices=[('', '--')] + - [(choice.pk, unicode(choice)) for choice in choices], + [(choice.pk, str(choice)) for choice in choices], required=False) elif prop.type == 'A': widget = PropertyModel.TYPE_WIDGET[prop.type] @@ -287,12 +294,13 @@ class MarkerAdminFormBase(forms.ModelForm): Main form for marker """ is_admin = True - name = forms.CharField(_(u"Name"), required=True) + name = forms.CharField(label=_(u"Name"), required=True) description = forms.CharField(widget=TextareaAdminWidget, required=False) _PROPERTY_FILTERS = {} class Meta: model = Marker + exclude = [] @classmethod def _set_cls_fields(cls): @@ -459,10 +467,11 @@ class RouteAdminForm(forms.ModelForm): Main form for route """ is_admin = True - name = forms.CharField(_(u"Name"), required=True) + name = forms.CharField(label=_(u"Name"), required=True) class Meta: model = Route + exclude = [] def __init__(self, *args, **keys): """ @@ -576,6 +585,7 @@ class PolygonAdminForm(MarkerAdminForm): """ class Meta: model = Polygon + exclude = [] class PolygonForm(PolygonAdminForm): @@ -633,6 +643,7 @@ class BaseFileForm(forms.ModelForm): class MultimediaFileAdminForm(forms.ModelForm): class Meta: model = MultimediaFile + exclude = [] class Media: js = list(settings.JQUERY_JS_URLS) + [ @@ -668,6 +679,7 @@ MultimediaFileFormSet = formset_factory(MultimediaFileForm, can_delete=True) class PictureFileAdminForm(forms.ModelForm): class Meta: model = PictureFile + exclude = [] class Media: js = list(settings.JQUERY_JS_URLS) + [ @@ -719,6 +731,7 @@ class AreaAdminForm(forms.ModelForm): class Meta: model = Area + exclude = [] def __init__(self, *args, **keys): """ @@ -762,7 +775,7 @@ class AreaAdminForm(forms.ModelForm): q = q.exclude(pk=self.instance.pk) if q.count(): msg = _(u"The area \"%s\" has the same order, you need to" - u" choose another one.") % unicode(q.all()[0]) + u" choose another one.") % str(q.all()[0]) raise forms.ValidationError(msg) return self.cleaned_data @@ -800,6 +813,7 @@ class AreaForm(AreaAdminForm): """ class Meta: model = Area + exclude = [] CHIMERE_ROUTING_TRANSPORT = [] ROUTING_INIT = None |