fix django-cms plugins loading, remove sys.path tampering
This commit is contained in:
parent
8f4ded1106
commit
864542fdca
|
@ -1,8 +1 @@
|
||||||
import os.path
|
|
||||||
import sys
|
|
||||||
|
|
||||||
__version__ = '0.1'
|
__version__ = '0.1'
|
||||||
|
|
||||||
apps_dir = os.path.join(os.path.dirname(__file__), 'apps')
|
|
||||||
if apps_dir not in sys.path:
|
|
||||||
sys.path.append(apps_dir)
|
|
||||||
|
|
|
@ -186,7 +186,7 @@ if 'wcsinst.wcsinst' in settings.INSTALLED_APPS:
|
||||||
c += 1
|
c += 1
|
||||||
sleep_length *= 2
|
sleep_length *= 2
|
||||||
if done and 'auquotidien_plugin' in settings.INSTALLED_APPS:
|
if done and 'auquotidien_plugin' in settings.INSTALLED_APPS:
|
||||||
from auquotidien_plugin.models import AuQuotidienAPI
|
from .apps.auquotidien_plugin.models import AuQuotidienAPI
|
||||||
defaults = {
|
defaults = {
|
||||||
'name': instance.title,
|
'name': instance.title,
|
||||||
'orig': request.META['HTTP_HOST'],
|
'orig': request.META['HTTP_HOST'],
|
||||||
|
|
|
@ -7,8 +7,8 @@ from django.utils.translation import ugettext_lazy as _
|
||||||
from cms.plugin_pool import plugin_pool
|
from cms.plugin_pool import plugin_pool
|
||||||
|
|
||||||
|
|
||||||
from data_source_plugin.cms_plugins import DataSourcePlugin, Data
|
from ..data_source_plugin.cms_plugins import DataSourcePlugin, Data
|
||||||
from data_source_plugin.models import DataSource
|
from ..data_source_plugin.models import DataSource
|
||||||
|
|
||||||
from .models import (
|
from .models import (
|
||||||
AuQuotidienActiveFormsPlugin as AuQuotidienActiveFormsPluginModel,
|
AuQuotidienActiveFormsPlugin as AuQuotidienActiveFormsPluginModel,
|
||||||
|
|
|
@ -5,7 +5,7 @@ from django.db import models
|
||||||
from cms.models import CMSPlugin
|
from cms.models import CMSPlugin
|
||||||
|
|
||||||
|
|
||||||
from data_source_plugin.models import DataSource
|
from ..data_source_plugin.models import DataSource
|
||||||
|
|
||||||
|
|
||||||
__all__ = [ 'AuQuotidienAPI', 'AuQuotidienActiveFormsPlugin' ]
|
__all__ = [ 'AuQuotidienAPI', 'AuQuotidienActiveFormsPlugin' ]
|
||||||
|
|
|
@ -30,8 +30,8 @@ class CustomIndexDashboard(Dashboard):
|
||||||
_('Contents'),
|
_('Contents'),
|
||||||
models=(
|
models=(
|
||||||
'cms.models.pagemodel.Page',
|
'cms.models.pagemodel.Page',
|
||||||
'data_source_plugin.models.DataSource',
|
'portail_citoyen.apps.data_source_plugin.models.DataSource',
|
||||||
'feed_plugin.models.Feed',
|
'portail_citoyen.apps.feed_plugin.models.Feed',
|
||||||
),
|
),
|
||||||
))
|
))
|
||||||
|
|
||||||
|
|
|
@ -141,11 +141,11 @@ INSTALLED_APPS = (
|
||||||
'cms.plugins.video',
|
'cms.plugins.video',
|
||||||
'cmsplugin_text_wrapper',
|
'cmsplugin_text_wrapper',
|
||||||
'cms_ajax_text_plugin',
|
'cms_ajax_text_plugin',
|
||||||
'feed_plugin',
|
'portail_citoyen.apps.feed_plugin',
|
||||||
'data_source_plugin',
|
'portail_citoyen.apps.data_source_plugin',
|
||||||
'a2_service_list_plugin',
|
'portail_citoyen.apps.a2_service_list_plugin',
|
||||||
'federation_plugin',
|
'portail_citoyen.apps.federation_plugin',
|
||||||
'auquotidien_plugin',
|
'portail_citoyen.apps.auquotidien_plugin',
|
||||||
'sekizai',
|
'sekizai',
|
||||||
'portail_citoyen',
|
'portail_citoyen',
|
||||||
)
|
)
|
||||||
|
|
Reference in New Issue