[Testbot] Plone 5.0 - Python 2.7 - Build # 2271 - Fixed! - 0 failure(s)

jenkins at plone.org jenkins at plone.org
Wed Apr 16 01:16:38 UTC 2014


-------------------------------------------------------------------------------
Plone 5.0 - Python 2.7 - Build # 2271 - Fixed!
-------------------------------------------------------------------------------

http://jenkins.plone.org/job/plone-5.0-python-2.7/2271/


-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------

Repository: plone.app.controlpanel
Branch: refs/heads/master
Date: 2014-04-16T02:23:16+02:00
Author: Johannes Raggam (thet) <raggam-nl at adm.at>
Commit: https://github.com/plone/plone.app.controlpanel/commit/3674ccc0d81a3387274fad21603a3594e0795b77

hanged timezone setting check to work with controlpanel consolidation effort fo Plone 5.

Files changed:
M CHANGES.txt
M plone/app/controlpanel/overview.pt
M plone/app/controlpanel/overview.py

diff --git a/CHANGES.txt b/CHANGES.txt
index 3d53a17..54b537d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,9 @@ Changelog
 2.4.3 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Changed timezone setting check to work with controlpanel consolidation effort
+  of Plone 5.
+  [thet]
 
 
 2.4.2 (2014-04-13)
diff --git a/plone/app/controlpanel/overview.pt b/plone/app/controlpanel/overview.pt
index 3c3a173..1aade30 100644
--- a/plone/app/controlpanel/overview.pt
+++ b/plone/app/controlpanel/overview.pt
@@ -66,14 +66,14 @@
         </strong>
         <span tal:omit-tag="" i18n:translate="text_no_timezone_configured">
 
-            You have not set the portal timezone. Date handling will not work
-            properly for timezone aware date/time values.
+            You have not set the portal timezone. Date/Time handling will not
+            work properly for timezone aware date/time values.
             Go to the
             <tal:link i18n:name="label_mail_event_settings_link">
                 <a href=""
                    i18n:translate="text_no_timezone_configured_control_panel_link"
-                   tal:attributes="href string:${portal_url}/@@event-settings"
-                >Event settings control panel</a>
+                   tal:attributes="href string:${portal_url}/@@dateandtime-controlpanel"
+                >Date and Time settings control panel</a>
             </tal:link>
             to fix this.
         </span>
diff --git a/plone/app/controlpanel/overview.py b/plone/app/controlpanel/overview.py
index 3fc5726..950941f 100644
--- a/plone/app/controlpanel/overview.py
+++ b/plone/app/controlpanel/overview.py
@@ -7,10 +7,10 @@
 from plone.app.controlpanel.form import ControlPanelView
 from plone.memoize.instance import memoize
 from plone.registry.interfaces import IRegistry
-from zope.component import queryUtility
+from zope.component import getUtility
 
 try:
-    from plone.app.event.interfaces import IEventSettings
+    from plone.app.event.interfaces import IEventSettings  # nopep8
     HAS_PAE = True
 except ImportError:
     HAS_PAE = False
@@ -81,19 +81,28 @@ def mailhost_warning(self):
         return True
 
     def timezone_warning(self):
+        """Returns true, if the portal_timezone is not set in the registry.
+        """
         if not HAS_PAE:
+            # No point of having a portal timezone configured without
+            # plone.app.event installed.
+            # TODO: Above applies to situation at time of writing. If other
+            # datetimes outside plone.app.event use proper timezones too, the
+            # HAS_PAE should be removed.
             return False
-        portal_timezone = None
-        reg = queryUtility(IRegistry, context=self.context, default=None)
-        if reg:
-            portal_timezone = reg.forInterface(
-                IEventSettings,
-                prefix="plone.app.event",
-                check=False  # Don't fail, if portal_timezone isn't set.
-            ).portal_timezone
+        # check if 'plone.portal_timezone' is in registry
+        registry = getUtility(IRegistry)
+        reg_key = "plone.portal_timezoner"
+        if reg_key not in registry:
+            # else use 'plone.app.event.portal_timezone'
+            # < Plone 5
+            reg_key = 'plone.app.event.portal_timezone'
+        if reg_key not in registry:
+            return True
+        portal_timezone = registry[reg_key]
         if portal_timezone:
             return False
-        return True
+        return True  # No portal_timezone found.
 
     def categories(self):
         return self.cptool().getGroups()




-------------------------------------------------------------------------------


More information about the Testbot mailing list