[Erp5-report] r41443 ivan - in /erp5/trunk/bt5/erp5_knowledge_pad: SkinTemplateItem/portal_...

[nobody at svn.erp5.org]

Author: ivan
Date: Wed Dec 15 10:17:31 2010
New Revision: 41443

URL: http://svn.erp5.org?rev=41443&view=rev
Log:
In Web Mode we can have a temporary Web Site objects created based on current language, takem this into account when determine right active pad.

Modified:
    erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/ERP5Site_getActiveKnowledgePadForUser.xml
    erp5/trunk/bt5/erp5_knowledge_pad/bt/revision

Modified: erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/ERP5Site_getActiveKnowledgePadForUser.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/ERP5Site_getActiveKnowledgePadForUser.xml?rev=41443&r1=41442&r2=41443&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/ERP5Site_getActiveKnowledgePadForUser.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/ERP5Site_getActiveKnowledgePadForUser.xml [utf8] Wed Dec 15 10:17:31 2010
@@ -74,15 +74,20 @@ active_knowledge_pad, knowledge_pads = \
 if active_knowledge_pad is not None:\n
   return active_knowledge_pad, knowledge_pads\n
 \n
+# in Web Mode we can have a temporary Web Site objects created based on current language\n
+real_context = context\n
+if context.isTempObject():\n
+  real_context = context.getParentValue()\n
+\n
 # first filter if we have a custom Pad for the context\n
 for knowledge_pad in knowledge_pads:\n
   pad_state = knowledge_pad.getValidationState()\n
   publication_section = knowledge_pad.getPublicationSectionValue()\n
-  if publication_section == context and pad_state in visible_state_list:\n
+  if publication_section == real_context and pad_state in visible_state_list:\n
     if publication_section.getPortalType() == \'Web Site\' and default_pad_group in MARKER:\n
       # ERP5 Web Site front gadget\n
       return knowledge_pad, knowledge_pads\n
-    elif publication_section == context and knowledge_pad.getGroup() == default_pad_group:\n
+    elif publication_section == real_context and knowledge_pad.getGroup() == default_pad_group:\n
       # some Web Section can have a customized EXPLICILY "sticked" Pad\n
       return knowledge_pad, knowledge_pads\n
   elif publication_section == None and default_pad_group in MARKER and pad_state in visible_state_list:\n
@@ -149,6 +154,7 @@ return None, knowledge_pads\n
                             <string>_getiter_</string>
                             <string>active_pad</string>
                             <string>active_knowledge_pad</string>
+                            <string>real_context</string>
                             <string>knowledge_pad</string>
                             <string>pad_state</string>
                             <string>publication_section</string>

Modified: erp5/trunk/bt5/erp5_knowledge_pad/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/bt/revision?rev=41443&r1=41442&r2=41443&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/bt/revision [utf8] Wed Dec 15 10:17:31 2010
@@ -1 +1 @@
-658
\ No newline at end of file
+660
\ No newline at end of file