migration to django cms 3: unused plugin removed and new ones' packages
upgraded
This commit is contained in:
parent
386cdcd258
commit
821208e8d8
|
@ -76,8 +76,6 @@ class GroupPortailCitoyenAdmin(GroupAdmin):
|
||||||
else:
|
else:
|
||||||
return self.default_fieldsets
|
return self.default_fieldsets
|
||||||
|
|
||||||
|
|
||||||
admin.site.unregister(Group)
|
|
||||||
admin.site.register(models.Role, GroupPortailCitoyenAdmin)
|
admin.site.register(models.Role, GroupPortailCitoyenAdmin)
|
||||||
|
|
||||||
from authentic2.compat import get_user_model
|
from authentic2.compat import get_user_model
|
||||||
|
|
|
@ -4,7 +4,7 @@ from cms.plugin_base import CMSPluginBase
|
||||||
from cms.plugin_pool import plugin_pool
|
from cms.plugin_pool import plugin_pool
|
||||||
from models import A2ServiceListPlugin as A2ServiceListPluginModel
|
from models import A2ServiceListPlugin as A2ServiceListPluginModel
|
||||||
|
|
||||||
from authentic2.idp.views import service_list
|
from authentic2.views import service_list
|
||||||
|
|
||||||
class A2ServiceListPlugin(CMSPluginBase):
|
class A2ServiceListPlugin(CMSPluginBase):
|
||||||
model = A2ServiceListPluginModel
|
model = A2ServiceListPluginModel
|
||||||
|
@ -13,7 +13,7 @@ class A2ServiceListPlugin(CMSPluginBase):
|
||||||
text_enabled = True
|
text_enabled = True
|
||||||
|
|
||||||
def render(self, context, instance, placeholdre):
|
def render(self, context, instance, placeholdre):
|
||||||
context.update({
|
context.update({
|
||||||
'services': service_list(context['request']),
|
'services': service_list(context['request']),
|
||||||
})
|
})
|
||||||
return context
|
return context
|
||||||
|
|
|
@ -71,8 +71,8 @@ TEMPLATE_CONTEXT_PROCESSORS = (
|
||||||
'django.core.context_processors.request',
|
'django.core.context_processors.request',
|
||||||
'django.contrib.messages.context_processors.messages',
|
'django.contrib.messages.context_processors.messages',
|
||||||
'django.core.context_processors.static',
|
'django.core.context_processors.static',
|
||||||
'authentic2.context_processors.federations_processor',
|
'authentic2.context_processors.a2_processor',
|
||||||
'cms.context_processors.media',
|
'cms.context_processors.cms_settings',
|
||||||
'sekizai.context_processors.sekizai',
|
'sekizai.context_processors.sekizai',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -140,15 +140,8 @@ INSTALLED_APPS = (
|
||||||
'authentic2.attribute_aggregator',
|
'authentic2.attribute_aggregator',
|
||||||
'authentic2.disco_service',
|
'authentic2.disco_service',
|
||||||
'menus',
|
'menus',
|
||||||
'cms.plugins.file',
|
|
||||||
'cms.plugins.googlemap',
|
|
||||||
'cms.plugins.link',
|
|
||||||
'cms.plugins.picture',
|
|
||||||
'cms.plugins.snippet',
|
|
||||||
'cms.plugins.teaser',
|
|
||||||
'cms.plugins.video',
|
|
||||||
'cmsplugin_text_wrapper',
|
|
||||||
'cms_ajax_text_plugin',
|
'cms_ajax_text_plugin',
|
||||||
|
'djangocms_text_ckeditor',
|
||||||
'portail_citoyen.apps.feed_plugin',
|
'portail_citoyen.apps.feed_plugin',
|
||||||
'portail_citoyen.apps.data_source_plugin',
|
'portail_citoyen.apps.data_source_plugin',
|
||||||
'portail_citoyen.apps.a2_service_list_plugin',
|
'portail_citoyen.apps.a2_service_list_plugin',
|
||||||
|
@ -158,6 +151,14 @@ INSTALLED_APPS = (
|
||||||
'portail_citoyen',
|
'portail_citoyen',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
try:
|
||||||
|
import cmsplugin_blurp
|
||||||
|
INSTALLED_APPS += (
|
||||||
|
'cmsplugin_blurp',
|
||||||
|
)
|
||||||
|
except ImportError:
|
||||||
|
pass
|
||||||
|
|
||||||
MESSAGE_STORAGE = 'django.contrib.messages.storage.session.SessionStorage'
|
MESSAGE_STORAGE = 'django.contrib.messages.storage.session.SessionStorage'
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,14 +1,12 @@
|
||||||
--allow-all-external
|
--allow-all-external
|
||||||
--allow-unverified django-admin-tools
|
--allow-unverified django-admin-tools
|
||||||
-f https://repos.entrouvert.org/django-cms.git/
|
django-cms>=2.5.0
|
||||||
django-cms>=2.5.0,<3.0
|
|
||||||
-f https://repos.entrouvert.org/python-entrouvert.git/
|
-f https://repos.entrouvert.org/python-entrouvert.git/
|
||||||
python-entrouvert
|
python-entrouvert
|
||||||
requests>=1.0.0
|
requests>=1.0.0
|
||||||
cmsplugin-text-wrapper>=0.5
|
|
||||||
feedparser
|
feedparser
|
||||||
django>=1.5.1,<1.6
|
django>=1.5.1,<1.6
|
||||||
authentic2
|
authentic2
|
||||||
south>=0.8.4
|
south>=0.8.4
|
||||||
Pillow
|
Pillow
|
||||||
django-cms-ajax-text-plugin
|
djangocms-text-ckeditor
|
||||||
|
|
5
setup.py
5
setup.py
|
@ -119,11 +119,10 @@ setup(name="portail_citoyen",
|
||||||
'feedparser',
|
'feedparser',
|
||||||
'django>=1.5.1,<1.6',
|
'django>=1.5.1,<1.6',
|
||||||
'authentic2>2.0.2',
|
'authentic2>2.0.2',
|
||||||
'cmsplugin-text-wrapper>=0.5',
|
'django-cms>=2.5',
|
||||||
'django-cms>=2.5,<3.0',
|
|
||||||
'python-entrouvert',
|
'python-entrouvert',
|
||||||
'south>=0.8.4',
|
'south>=0.8.4',
|
||||||
'django-cms-ajax-text-plugin',
|
'djangocms-text-ckeditor',
|
||||||
'Pillow',
|
'Pillow',
|
||||||
],
|
],
|
||||||
dependency_links = [
|
dependency_links = [
|
||||||
|
|
Reference in New Issue