Merge pull request #143 from plone/plip-13770-portal-tools-removal

remove portal_calendar
plone · Nov 12, 2013 · 88e82ab · 88e82ab · mister-roboto · Nov 12, 2013
2 parents 0dd932e + e5263b1
commit 88e82ab
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 351 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -8,6 +8,9 @@ Changelog
 5.0a1 (unreleased)
 ------------------
 
+- Remove the portal_calendar tool and the dependency on CMFCalendar.
+  [davisagli]
+
 - Remove the plone_deprecated skin layer.
   [gforcada, davisagli]
 

diff --git a/Products/CMFPlone/CalendarTool.py b/Products/CMFPlone/CalendarTool.py
diff --git a/Products/CMFPlone/__init__.py b/Products/CMFPlone/__init__.py
@@ -137,7 +137,6 @@ def initialize(context):
     import TypesTool
     import CatalogTool
     import SkinsTool
-    import CalendarTool
     import QuickInstallerTool
     import TranslationServiceTool
 
@@ -155,7 +154,6 @@ def initialize(context):
              TypesTool.TypesTool,
              CatalogTool.CatalogTool,
              SkinsTool.SkinsTool,
-             CalendarTool.CalendarTool,
              QuickInstallerTool.QuickInstallerTool,
              TranslationServiceTool.TranslationServiceTool,
             )

diff --git a/Products/CMFPlone/profiles/default/controlpanel.xml b/Products/CMFPlone/profiles/default/controlpanel.xml
@@ -126,13 +126,6 @@
     visible="False" i18n:attributes="title">
   <permission>Manage portal</permission>
  </configlet>
- <configlet title="Calendar" action_id="CalendarSettings" appId="Plone"
-    category="Plone" condition_expr=""
-    icon_expr="string:$portal_url/event_icon.png"
-    url_expr="string:${portal_url}/@@calendar-controlpanel" visible="True"
-    i18n:attributes="title">
-  <permission>Plone Site Setup: Calendar</permission>
- </configlet>
  <configlet title="HTML Filtering" action_id="HtmlFilter" appId="HtmlFilter"
     category="Plone" condition_expr=""
     icon_expr="string:$portal_url/htmlfilter_icon.png"

diff --git a/Products/CMFPlone/profiles/default/toolset.xml b/Products/CMFPlone/profiles/default/toolset.xml
@@ -14,8 +14,6 @@
            class="Products.CMFPlone.ActionsTool.ActionsTool"/>
  <required tool_id="portal_atct"
            class="Products.ATContentTypes.tool.atct.ATCTTool"/>
- <required tool_id="portal_calendar"
-           class="Products.CMFPlone.CalendarTool.CalendarTool"/>
  <required tool_id="portal_catalog"
            class="Products.CMFPlone.CatalogTool.CatalogTool"/>
  <required tool_id="portal_controlpanel"

diff --git a/Products/CMFPlone/setuphandlers.py b/Products/CMFPlone/setuphandlers.py
@@ -23,7 +23,6 @@ def getNonInstallableProducts(self):
             'ATContentTypes', 'Products.ATContentTypes',
             'ATReferenceBrowserWidget', 'Products.ATReferenceBrowserWidget',
             'archetypes.referencebrowserwidget',
-            'CMFCalendar', 'Products.CMFCalendar',
             'CMFDefault', 'Products.CMFDefault',
             'CMFPlone', 'Products.CMFPlone', 'Products.CMFPlone.migrations',
             'CMFTopic', 'Products.CMFTopic',
@@ -55,7 +54,6 @@ def getNonInstallableProducts(self):
             'plone.app.registry',
             'plone.app.search',
             'plone.app.z3cform',
-
             ]
 
 

diff --git a/Products/CMFPlone/tests/testCalendarTool.py b/Products/CMFPlone/tests/testCalendarTool.py