[Erp5-report] r24897 - /erp5/trunk/products/CMFActivity/ActivityTool.py

[nobody at svn.erp5.org]

Author: vincent
Date: Mon Dec 15 15:49:05 2008
New Revision: 24897

URL: http://svn.erp5.org?rev=24897&view=rev
Log:
Restore skin selection after each activity invocation, to make sure activity mechanism can work (it relies on skins to reach ZSQLMethods for activity book-keeping).
Also, solves problems where activities invoked after an activity which called changeSkin would get an unexpected skin selection.

Modified:
    erp5/trunk/products/CMFActivity/ActivityTool.py

Modified: erp5/trunk/products/CMFActivity/ActivityTool.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/ActivityTool.py?rev=24897&r1=24896&r2=24897&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/ActivityTool.py [utf8] (original)
+++ erp5/trunk/products/CMFActivity/ActivityTool.py [utf8] Mon Dec 15 15:49:05 2008
@@ -1084,6 +1084,10 @@
       try:
         message(my_self)
       finally:
+        if my_self is not self: # We rewrapped self
+          # Restore default skin selection
+          skinnable = self.getPortalObject()
+          skinnable.changeSkin(skinnable.getSkinNameFromRequest(request))
         if old_ihotfix_context is not False:
           # Restore iHotfix context
           id = get_ident()