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

Merge branch 'hotfix/v0.12.2' into development

Browse Source 
Conflicts:
	apps/common/__init__.py
	apps/documents/forms.py
	apps/feedback/__init__.py
	apps/history/__init__.py
	apps/main/__init__.py
	apps/scheduler/api.py
	apps/sources/models.py
	docs/releases/index.rst
	requirements/production.txt
	settings.py
	urls.py
This commit is contained in:
Roberto Rosario
2012-06-30 04:00:01 -04:00
parent 90c411f554 04de24ea51
commit 080d68c169
438 changed files with 12762 additions and 4473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/sources/models.py
View File

@@ -26,7 +26,7 @@ from django.core.files.base import ContentFile
from converter.api import get_available_transformations_choices
from converter.literals import DIMENSION_SEPARATOR
from documents.models import DocumentType, Document
from documents.literals import HISTORY_DOCUMENT_CREATED
from documents.events import HISTORY_DOCUMENT_CREATED
from document_indexing.api import update_indexes
from history.api import create_history
from metadata.models import MetadataType
@@ -133,7 +133,7 @@ class BaseModel(models.Model):
new_version_data = {}
try:
new_version = document.new_version(file=file_object, **new_version_data)
new_version = document.new_version(file=file_object, user=user, **new_version_data)
except Exception, exc:
logger.error('Unhandled exception: %s' % exc)
# Don't leave the database in a broken state