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

[nobody at svn.erp5.org]

Author: ivan
Date: Mon Jan 24 10:06:36 2011
New Revision: 42613

URL: http://svn.erp5.org?rev=42613&view=rev
Log:
Use only one script to get active knowledge pad for context everywhere.

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

Modified: erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml?rev=42613&r1=42612&r2=42613&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml [utf8] Mon Jan 24 10:06:36 2011
@@ -41,8 +41,7 @@
     tal:define="global mode python: options.get(\'mode\', request.get(\'gadget_mode\', \'erp5_front\'));\n
                 global default_pad_group python: options.get(\'default_pad_group\', request.get(\'gadget_default_pad_group\', \'\'));\n
                 kw python: dict(mode=mode, default_pad_group=default_pad_group);\n
-                knowledge_pads python:  here.ERP5Site_getKnowledgePadListForUser(**kw);\n
-                struct python: here.ERP5Site_getActiveKnowledgePadForUser(knowledge_pads, **kw);\n
+                struct python: here.ERP5Site_getActiveKnowledgePadForUser(**kw);\n
                 global active_knowledge_pad python: struct[0];\n
                 global knowledge_pads python: struct[1];\n
                 global columns python: options.get(\'columns\', 3);\n

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=42613&r1=42612&r2=42613&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] Mon Jan 24 10:06:36 2011
@@ -56,6 +56,8 @@ MARKER = (\'\', None,)\n
 visible_state_list = [\'visible\', \'public\']\n
 isAnon = context.portal_membership.isAnonymousUser()\n
 \n
+knowledge_pads = context.ERP5Site_getKnowledgePadListForUser(mode=mode,\n
+                                                             default_pad_group=default_pad_group)\n
 if isAnon and len(knowledge_pads)>=1:\n
   # for anonymous we return the first one found \n
   return knowledge_pads[0], knowledge_pads\n
@@ -108,7 +110,7 @@ return None, knowledge_pads\n
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>knowledge_pads = [], mode = None, default_pad_group=None</string> </value>
+            <value> <string>mode = None, default_pad_group=None</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

Modified: erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/ERP5Site_hasUserActivity.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/ERP5Site_hasUserActivity.xml?rev=42613&r1=42612&r2=42613&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/ERP5Site_hasUserActivity.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/ERP5Site_hasUserActivity.xml [utf8] Mon Jan 24 10:06:36 2011
@@ -55,11 +55,9 @@ portal = context.getPortalObject()\n
 \n
 if active_knowledge_pad is None and js_call:\n
   # only for asynchronous checks\n
-  kw = dict(mode=mode, \n
-            default_pad_group=default_pad_group)\n
-  knowledge_pads = context.ERP5Site_getKnowledgePadListForUser(**kw)\n
   active_knowledge_pad, knowledge_pads = context.ERP5Site_getActiveKnowledgePadForUser(\n
-                                                   knowledge_pads, **kw)\n
+                                                   mode=mode, \n
+                                                   default_pad_group=default_pad_group)\n
 \n
 if active_knowledge_pad is None:\n
   # no pad but it may be reindexed in an activity now, check by tag\n

Modified: erp5/trunk/bt5/erp5_knowledge_pad/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/bt/revision?rev=42613&r1=42612&r2=42613&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/bt/revision [utf8] Mon Jan 24 10:06:36 2011
@@ -1 +1 @@
-685
\ No newline at end of file
+686
\ No newline at end of file