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

Code cleanups.

Browse Source 
Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2018-08-14 03:41:07 -04:00
parent b619444e43
commit 5cd7ac88d6
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mayan/apps/documents/forms.py
View File

@@ -84,12 +84,13 @@ class DocumentForm(forms.ModelForm):
if self.instance and self.instance.pk:
document_type = self.instance.document_type
filenames_qs = document_type.filenames.filter(enabled=True)
if filenames_qs.count():
filenames_queryset = document_type.filenames.filter(enabled=True)
if filenames_queryset:
self.fields[
'document_type_available_filenames'
] = forms.ModelChoiceField(
queryset=filenames_qs,
queryset=filenames_queryset,
required=False,
label=_('Quick document rename'),
widget=forms.Select(

26
mayan/apps/documents/managers.py
View File

@@ -47,19 +47,6 @@ class DocumentPageManager(models.Manager):
return self.get(document_version__pk=document_version.pk, page_number=page_number)
class DocumentVersionManager(models.Manager):
def get_by_natural_key(self, checksum, document_natural_key):
Document = apps.get_model(
app_label='documents', model_name='Document'
)
try:
document = Document.objects.get_by_natural_key(*document_natural_key)
except Document.DoesNotExist:
raise self.model.DoesNotExist
return self.get(document__pk=document.pk, checksum=checksum)
class DocumentTypeManager(models.Manager):
def check_delete_periods(self):
logger.info('Executing')
@@ -127,6 +114,19 @@ class DocumentTypeManager(models.Manager):
return self.get(label=label)
class DocumentVersionManager(models.Manager):
def get_by_natural_key(self, checksum, document_natural_key):
Document = apps.get_model(
app_label='documents', model_name='Document'
)
try:
document = Document.objects.get_by_natural_key(*document_natural_key)
except Document.DoesNotExist:
raise self.model.DoesNotExist
return self.get(document__pk=document.pk, checksum=checksum)
class DuplicatedDocumentManager(models.Manager):
def clean_empty_duplicate_lists(self):
self.filter(documents=None).delete()