From c1c67a013b8a54661d1e9c572ea4d6ba162a4840 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Mon, 2 Jul 2012 10:54:03 +0200 Subject: [PATCH] Renaming *sepcar* field to *sepchar*. (thanks to Walter Doekes) fixes #285 --- modoboa/admin/forms.py | 10 +++++----- modoboa/admin/views.py | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/modoboa/admin/forms.py b/modoboa/admin/forms.py index b7b895eb4..3be6b1c2e 100644 --- a/modoboa/admin/forms.py +++ b/modoboa/admin/forms.py @@ -322,16 +322,16 @@ class ForwardForm(GenericAliasForm): class ImportDataForm(forms.Form): sourcefile = forms.FileField(label=ugettext_lazy("Select a file")) - sepcar = forms.CharField(label=ugettext_lazy("Separator"), max_length=1, required=False) + sepchar = forms.CharField(label=ugettext_lazy("Separator"), max_length=1, required=False) def __init__(self, *args, **kwargs): super(ImportDataForm, self).__init__(*args, **kwargs) - self.fields["sepcar"].widget.attrs = {"class" : "span1"} + self.fields["sepchar"].widget.attrs = {"class" : "span1"} - def clean_sepcar(self): - if self.cleaned_data["sepcar"] == "": + def clean_sepchar(self): + if self.cleaned_data["sepchar"] == "": return ";" - return str(self.cleaned_data["sepcar"]) + return str(self.cleaned_data["sepchar"]) class AccountFormGeneral(forms.ModelForm): username = forms.CharField(label=ugettext_lazy("Username"), max_length=254) diff --git a/modoboa/admin/views.py b/modoboa/admin/views.py index a12bb12ae..36ea3cffd 100644 --- a/modoboa/admin/views.py +++ b/modoboa/admin/views.py @@ -582,7 +582,7 @@ def importdata(request): try: reader = csv.reader(request.FILES['sourcefile'], - delimiter=form.cleaned_data['sepcar']) + delimiter=form.cleaned_data['sepchar']) except Exception, e: error = str(e) @@ -602,7 +602,6 @@ def importdata(request): }) except (IntegrityError, ModoboaException), e: error = str(e) - print error return _render(request, "admin/import_done.html", { "status" : "ko", "msg" : error