matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Re enable per source document type field

Browse Source
This commit is contained in:
Roberto Rosario
2014-10-25 19:38:42 -04:00
parent 1c87866a63
commit 491b7a7af4
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mayan/apps/sources/models.py
View File

@@ -183,8 +183,7 @@ class OutOfProcessSource(Source):
class IntervalBaseModel(OutOfProcessSource):
interval = models.PositiveIntegerField(default=DEFAULT_INTERVAL, verbose_name=_('Interval'), help_text=_('Interval in seconds between checks for new documents.'))
# TEMP: Until migration problem is fixed
#document_type = models.ForeignKey(DocumentType, null=True, verbose_name=_('Document type'), help_text=_('Assign a document type to documents uploaded from this source.'))
document_type = models.ForeignKey(DocumentType, verbose_name=_('Document type'), help_text=_('Assign a document type to documents uploaded from this source.'))
uncompress = models.CharField(max_length=1, choices=SOURCE_UNCOMPRESS_CHOICES, verbose_name=_('Uncompress'), help_text=_('Whether to expand or not, compressed archives.'))
def _get_periodic_task_name(self, pk=None):
@@ -369,9 +368,7 @@ class WatchFolderSource(IntervalBaseModel):
if os.path.isfile(full_path):
with File(file=open(full_path, mode='rb')) as file_object:
# TEMP: Until migration document type problem is fixed
document_type = DocumentType.objects.all()[0]
self.upload_document(file_object, label=file_name, document_type=document_type, expand=(self.uncompress == SOURCE_UNCOMPRESS_CHOICE_Y), language=LANGUAGE)
self.upload_document(file_object, label=file_name, document_type=self.document_type, expand=(self.uncompress == SOURCE_UNCOMPRESS_CHOICE_Y), language=LANGUAGE)
os.unlink(full_path)
class Meta: