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

Change import order to avoid conflict

Browse Source
This commit is contained in:
Roberto Rosario
2012-08-03 10:48:34 -04:00
parent 8b4cf87368
commit 59e75176fe
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/bootstrap/api.py
View File

@@ -4,12 +4,12 @@ from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ugettext from django.utils.translation import ugettext
from django.contrib.auth.models import User, Group from django.contrib.auth.models import User, Group
from permissions.models import Role
from documents.models import DocumentType, DocumentTypeFilename, Document
from metadata.models import MetadataType, MetadataSet
from document_indexing.models import Index, IndexTemplateNode
from sources.models import WebForm, StagingFolder from sources.models import WebForm, StagingFolder
from history.models import History from history.models import History
from permissions.models import Role
from metadata.models import MetadataType, MetadataSet
from documents.models import DocumentType, DocumentTypeFilename, Document
from document_indexing.models import Index, IndexTemplateNode
from taggit.models import Tag from taggit.models import Tag
from tags.models import TagProperties from tags.models import TagProperties
from folders.models import Folder from folders.models import Folder

2
settings.py
View File

@@ -188,7 +188,7 @@ INSTALLED_APPS = (
'workflows', 'workflows',
'checkouts', 'checkouts',
'rest_api', 'rest_api',
#'bootstrap', 'bootstrap',
'statistics', 'statistics',
# Has to be last so the other apps can register it's signals # Has to be last so the other apps can register it's signals