Changed apps loading order to fix source app dependency error

apps/main/__init__.py

@@ -9,8 +9,7 @@ from converter import formats_list
 from documents import document_type_views
 from metadata import setup_metadata_type_list, metadata_type_setup_views
 from metadata import setup_metadata_set_list, metadata_set_setup_views
-#from sources import source_list, source_views
-#from sources import source_views
+from sources import source_list, source_views
 
 from main.conf.settings import SIDE_BAR_SEARCH
 from main.conf.settings import DISABLE_HOME_VIEW
@@ -52,15 +51,14 @@ register_top_menu('about', link={'text': _(u'about'), 'view': 'about', 'famfam':
 
 register_links(['tools_menu', 'statistics', 'history_list', 'history_view', 'formats_list'], [tools_menu, statistics, history_list, formats_list, sentry], menu_name='secondary_menu')
 
-#setup_links = [check_settings, role_list, user_list, group_list, document_types, setup_metadata_type_list, setup_metadata_set_list, source_list, admin_site]
-setup_links = [check_settings, role_list, user_list, group_list, document_types, setup_metadata_type_list, setup_metadata_set_list, admin_site]
+setup_links = [check_settings, role_list, user_list, group_list, document_types, setup_metadata_type_list, setup_metadata_set_list, source_list, admin_site]
 register_links(['setting_list'], setup_links, menu_name='secondary_menu')
 register_links(permission_views, setup_links, menu_name='secondary_menu')
 register_links(user_management_views, setup_links, menu_name='secondary_menu')
 register_links(document_type_views, setup_links, menu_name='secondary_menu')
 register_links(metadata_type_setup_views, setup_links, menu_name='secondary_menu')
 register_links(metadata_set_setup_views, setup_links, menu_name='secondary_menu')
-#register_links(source_views, setup_links, menu_name='secondary_menu')
+register_links(source_views, setup_links, menu_name='secondary_menu')
 
 
 def get_version():

apps/sources/views.py

@@ -12,6 +12,7 @@ from documents.models import DocumentType
 from documents.conf.settings import THUMBNAIL_SIZE
 from metadata.api import decode_metadata_from_url, metadata_repr_as_list
 from permissions.api import check_permissions
+from common.utils import encapsulate
 import sendfile
 
 from sources.models import WebForm, StagingFolder, SourceTransformation, \
@@ -485,7 +486,7 @@ def setup_source_transformation_list(request, source_type, source_id):
         'list_object_variable_name': 'transformation',
         'extra_columns': [
             {'name': _(u'order'), 'attribute': 'order'},
-            {'name': _(u'transformation'), 'attribute': lambda x: x.get_transformation_display()},
+            {'name': _(u'transformation'), 'attribute': encapsulate(lambda x: x.get_transformation_display())},
             {'name': _(u'arguments'), 'attribute': 'arguments'}
             ],
         'hide_link': True,

settings.py

@@ -123,7 +123,6 @@ INSTALLED_APPS = (
     'smart_settings',
     'navigation',
     'web_theme',
-    'main',
     'history',
     'common',
     'metadata',
@@ -153,6 +152,7 @@ INSTALLED_APPS = (
     'mimetype',
     'scheduler',
     'job_processor',
+    'main',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (