smokephil/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-12-13 01:57:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

s/Sender/Correspondent & reworked the (im|ex)porter

Browse source
This commit is contained in:
Daniel Quinn 2016-03-03 20:52:42 +00:00
parent fad466477b
commit 070463b85a
14 changed files with 342 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/documents/forms.py
View file

@ -8,7 +8,7 @@ from time import mktime
from django import forms
from django.conf import settings
from .models import Document, Sender
from .models import Document, Correspondent
from .consumer import Consumer
@ -24,7 +24,9 @@ class UploadForm(forms.Form):
}
sender = forms.CharField(
max_length=Sender._meta.get_field("name").max_length, required=False)
max_length=Correspondent._meta.get_field("name").max_length,
required=False
)
title = forms.CharField(
max_length=Document._meta.get_field("title").max_length,
required=False
@ -41,7 +43,7 @@ class UploadForm(forms.Form):
sender = self.cleaned_data.get("sender")
if not sender:
return None
if not Sender.SAFE_REGEX.match(sender) or " - " in sender:
if not Correspondent.SAFE_REGEX.match(sender) or " - " in sender:
raise forms.ValidationError("That sender name is suspicious.")
return sender
@ -49,7 +51,7 @@ class UploadForm(forms.Form):
title = self.cleaned_data.get("title")
if not title:
return None
if not Sender.SAFE_REGEX.match(title) or " - " in title:
if not Correspondent.SAFE_REGEX.match(title) or " - " in title:
raise forms.ValidationError("That title is suspicious.")
def clean_document(self):