github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-18 05:51:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Renaming *sepcar* field to *sepchar*. (thanks to Walter Doekes)

Browse Source 
fixes #285
This commit is contained in:
Antoine Nguyen
2012-07-02 10:54:03 +02:00
parent 937a6f158b
commit c1c67a013b
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/admin/forms.py
+5 -5
View File
@@ -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)
modoboa/admin/views.py
+1 -2
View File
@@ -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