[Erp5-report] r36134 ivan - in /erp5/trunk/bt5/erp5_ui_test_core: SkinTemplateItem/portal_s...

[nobody at svn.erp5.org]

Author: ivan
Date: Wed Jun  9 10:49:52 2010
New Revision: 36134

URL: http://svn.erp5.org?rev=36134&view=rev
Log:
Support web mode as well.

Modified:
    erp5/trunk/bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_AddGadgetToActivePad.xml
    erp5/trunk/bt5/erp5_ui_test_core/bt/revision

Modified: erp5/trunk/bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_AddGadgetToActivePad.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_AddGadgetToActivePad.xml?rev=36134&r1=36133&r2=36134&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_AddGadgetToActivePad.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_AddGadgetToActivePad.xml [utf8] Wed Jun  9 10:49:52 2010
@@ -57,8 +57,12 @@
   Add (if not present) gadgets to current knowledge pad.\n
 """\n
 \n
-all_pads = [x for x in context.ERP5Site_getKnowledgePadListForUser(mode)]\n
-active_pad, all_pads = context.ERP5Site_getActiveKnowledgePadForUser(all_pads)\n
+all_pads = [x for x in context.ERP5Site_getKnowledgePadListForUser(mode, default_pad_group)]\n
+if mode.startswith(\'web\'):\n
+  active_pad, all_pads = context.WebSite_getActiveKnowledgePadForUser(all_pads, default_pad_group)\n
+else:\n
+  active_pad, all_pads = context.ERP5Site_getActiveKnowledgePadForUser(all_pads)\n
+\n
 active_pad = active_pad.getObject()\n
 gadget_list = active_pad.contentValues(filter={\'portal_type\': \'Knowledge Box\'})\n
 contained_gadgets = [x.getSpecialiseValue().getRelativeUrl() \\\n
@@ -84,7 +88,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>gadget_relative_url, mode=\'erp5_front\'</string> </value>
+            <value> <string>gadget_relative_url, mode=\'erp5_front\', default_pad_group=None</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -104,7 +108,7 @@
                   <dictionary>
                     <item>
                         <key> <string>co_argcount</string> </key>
-                        <value> <int>2</int> </value>
+                        <value> <int>3</int> </value>
                     </item>
                     <item>
                         <key> <string>co_varnames</string> </key>
@@ -112,6 +116,7 @@
                           <tuple>
                             <string>gadget_relative_url</string>
                             <string>mode</string>
+                            <string>default_pad_group</string>
                             <string>append</string>
                             <string>$append0</string>
                             <string>_getiter_</string>
@@ -137,6 +142,7 @@
             <value>
               <tuple>
                 <string>erp5_front</string>
+                <none/>
               </tuple>
             </value>
         </item>

Modified: erp5/trunk/bt5/erp5_ui_test_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test_core/bt/revision?rev=36134&r1=36133&r2=36134&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test_core/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_ui_test_core/bt/revision [utf8] Wed Jun  9 10:49:52 2010
@@ -1,1 +1,1 @@
-26
+27