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

Merge branch 'feature/lts' into merge_test

Browse Source 
Conflicts:
	mayan/apps/documents/api_views.py
	mayan/apps/documents/models.py
	mayan/apps/folders/__init__.py
	mayan/apps/folders/urls.py
	mayan/apps/folders/views.py
	mayan/apps/tags/urls.py
	mayan/apps/tags/views.py
	mayan/settings/base.py
This commit is contained in:
Roberto Rosario
2014-10-03 11:41:41 -04:00
parent f26f202c4d b20314cd43
commit 3b03af9295
21 changed files with 288 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mayan/apps/documents/models.py
View File

@@ -78,7 +78,7 @@ class Document(models.Model):
Defines a single document with it's fields and properties
"""
uuid = models.CharField(max_length=48, blank=True, editable=False)
document_type = models.ForeignKey(DocumentType, verbose_name=_(u'Document type'), null=True, blank=True)
document_type = models.ForeignKey(DocumentType, verbose_name=_(u'Document type'), related_name='documents', null=True, blank=True)
description = models.TextField(blank=True, null=True, verbose_name=_(u'Description'))
date_added = models.DateTimeField(verbose_name=_(u'Added'), db_index=True, editable=False)