Resolve all objects in portal_callables

bd5e4c85 · Klaus Wölfel · Ivan Tyagov · fa172b02 · bd5e4c85 · bd5e4c85
Commit bd5e4c85 authored Jul 27, 2016 by Klaus Wölfel Committed by Ivan Tyagov Sep 08, 2017
Showing with 15 additions and 5 deletions

product/ERP5Type/patches/CMFCoreSkinnable.py product/ERP5Type/patches/CMFCoreSkinnable.py +13 -4

product/ERP5Type/patches/CMFCoreSkinsTool.py product/ERP5Type/patches/CMFCoreSkinsTool.py +2 -1

No files found.
--- a/product/ERP5Type/patches/CMFCoreSkinnable.py
+++ b/product/ERP5Type/patches/CMFCoreSkinnable.py
@@ -30,7 +30,7 @@ from Acquisition import aq_base
  during the same request.
 """

-def _initializeCache(skin_tool, skin_folder_id_list):
+def _initializeCache(portal_callables, skin_tool, skin_folder_id_list):
    skin_list = {}
    for skin_folder_id in skin_folder_id_list[::-1]:
      try:
@@ -40,6 +40,9 @@ def _initializeCache(skin_tool, skin_folder_id_list):
                               ' but does not exist.' % skin_folder_id)
      else:
        skin_list.update(dict.fromkeys(skin_folder.objectIds(), skin_folder_id))
+    # update skin_list with objects in portal_callables
+    if portal_callables is not None:
+      skin_list.update(dict.fromkeys(portal_callables.objectIds(), "portal_callables"))
    return skin_list

 def CMFCoreSkinnableSkinnableObjectManager_initializeCache(self):
@@ -50,10 +53,13 @@ def CMFCoreSkinnableSkinnableObjectManager_initializeCache(self):
  if portal_skins is None:
    return
  portal_skins = portal_skins.aq_base
+  portal_callables = getattr(self, 'portal_callables', None)
+  if portal_callables is not None:
+    portal_callables = portal_callables.aq_base
  skin_selection_mapping = {}
  for selection_name, skin_folder_id_string in portal_skins._getSelections().iteritems():
-    skin_selection_mapping[selection_name] = _initializeCache(portal_skins,
-      skin_folder_id_string.split(','))
+    skin_selection_mapping[selection_name] = _initializeCache(portal_callables,
+      portal_skins, skin_folder_id_string.split(','))
  portal_skins._v_skin_location_list = skin_selection_mapping
  return skin_selection_mapping

@@ -79,7 +85,8 @@ def skinResolve(self, selection, name):
      if selection in skin_selection_mapping or \
         isinstance(selection, basestring):
        return
-      skin_list = portal_skins._getSelections()[selection[0]].split(',')
+      skin_list = portal_skins._getSelections()[selection[0]].split(',') \
+                  + ['portal_callables']
      skin_selection_mapping[selection] = skin_list = _initializeCache(
        portal_skins, skin_list[1+skin_list.index(selection[1]):])
      try:
@@ -88,6 +95,8 @@ def skinResolve(self, selection, name):
        return
      reset = True
    try:
+      if skin_folder_id == "portal_callables":
+        return aq_base(getattr(aq_base(self.portal_callables), name))
      return aq_base(getattr(getattr(portal_skins, skin_folder_id), name))
    except AttributeError:
      if reset:

--- a/product/ERP5Type/patches/CMFCoreSkinsTool.py
+++ b/product/ERP5Type/patches/CMFCoreSkinsTool.py
@@ -59,7 +59,8 @@ def CMFCoreSkinsTool__updateCacheEntry(self, container_id, object_id):
      if not isinstance(selection_name, basestring):
        del skin_location_list[selection_name]
    for selection_name, skin_folder_id_string in self._getSelections().iteritems():
-      skin_folder_id_list = skin_folder_id_string.split(',')
+      # Add portal_callables to every selection
+      skin_folder_id_list = skin_folder_id_string.split(',') + ['portal_callables']
      if container_id in skin_folder_id_list:
        skin_folder_id_list.reverse()
        this_folder_index = skin_folder_id_list.index(container_id)