Commit a6de4c55 authored by Vincent Pelletier's avatar Vincent Pelletier

Restore skin selection after each activity invocation, to make sure activity...

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.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@24897 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent d000000d
...@@ -1084,6 +1084,10 @@ class ActivityTool (Folder, UniqueObject): ...@@ -1084,6 +1084,10 @@ class ActivityTool (Folder, UniqueObject):
try: try:
message(my_self) message(my_self)
finally: 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: if old_ihotfix_context is not False:
# Restore iHotfix context # Restore iHotfix context
id = get_ident() id = get_ident()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment