[Erp5-report] r8806 - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: SkinTemplate...

[nobody at svn.erp5.org]

Author: vincent
Date: Wed Jul 26 16:07:43 2006
New Revision: 8806

URL: http://svn.erp5.org?rev=8806&view=rev
Log:
Previous fix for dialog_select value was bad, this name is now chnaged to select_dialog. Updated filter & doDialog aswell.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doDialog.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ERP5XhtmlStyle_filterParameterList.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_dialog.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doDialog.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doDialog.xml?rev=8806&r1=8805&r2=8806&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doDialog.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doDialog.xml Wed Jul 26 16:07:43 2006
@@ -68,16 +68,7 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>from ZTUtils import make_query\n
-\n
-Base_doAction = dialog_select.split()\n
-doAction0 = Base_doAction[0]\n
-request = context.REQUEST\n
-\n
-return request.RESPONSE.redirect(doAction0 + \'?%s\' % make_query(\n
-            dialog_category = dialog_category,\n
-            cancel_url = cancel_url, \n
-            form_id = form_id ))\n
+            <value> <string>return conetxt.ERP5XhtmlStyle_redirect(dialog_select.split()[0], **kw)\n
 </string> </value>
         </item>
         <item>
@@ -100,7 +91,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>dialog_select, form_id, dialog_category, cancel_url</string> </value>
+            <value> <string>select_dialog, **kw</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -120,24 +111,19 @@
                   <dictionary>
                     <item>
                         <key> <string>co_argcount</string> </key>
-                        <value> <int>4</int> </value>
+                        <value> <int>1</int> </value>
                     </item>
                     <item>
                         <key> <string>co_varnames</string> </key>
                         <value>
                           <tuple>
+                            <string>select_dialog</string>
+                            <string>kw</string>
+                            <string>_apply_</string>
+                            <string>_getattr_</string>
+                            <string>conetxt</string>
+                            <string>_getitem_</string>
                             <string>dialog_select</string>
-                            <string>form_id</string>
-                            <string>dialog_category</string>
-                            <string>cancel_url</string>
-                            <string>ZTUtils</string>
-                            <string>make_query</string>
-                            <string>_getattr_</string>
-                            <string>Base_doAction</string>
-                            <string>_getitem_</string>
-                            <string>doAction0</string>
-                            <string>context</string>
-                            <string>request</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ERP5XhtmlStyle_filterParameterList.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ERP5XhtmlStyle_filterParameterList.xml?rev=8806&r1=8805&r2=8806&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ERP5XhtmlStyle_filterParameterList.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ERP5XhtmlStyle_filterParameterList.xml Wed Jul 26 16:07:43 2006
@@ -84,7 +84,7 @@
 \n
 # Remove some special values\n
 # FIXME: This list should be mostly empty, every variable not to propagate must have a distinct prefix and thus be handled by isValid.\n
-for k in (\'-C\', \'SearchableText\', \'uids\', \'listbox_uid\', \'list_selection_name\', \'list_start\', \'portal_status_message\', \'update_action\', \'dialog_method\', \'cancel_method\', \'title\', \'description\', \'reset\', \'md5_object_uid_list\', \'id\', \'came_from\', \'dialog_select\'):\n
+for k in (\'-C\', \'SearchableText\', \'uids\', \'listbox_uid\', \'list_selection_name\', \'list_start\', \'portal_status_message\', \'update_action\', \'dialog_method\', \'cancel_method\', \'title\', \'description\', \'reset\', \'md5_object_uid_list\', \'id\', \'came_from\'):\n
   if parameter_list.has_key(k):\n
     del parameter_list[k]\n
 \n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_dialog.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_dialog.xml?rev=8806&r1=8805&r2=8806&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_dialog.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_dialog.xml Wed Jul 26 16:07:43 2006
@@ -95,7 +95,7 @@
                                         , \'object_report\'  : \'Select Report\'\n
                                         }.get(dialog_category, \'Select\')"\n
                   i18n:translate="" i18n:domain="ui"></label>\n
-            <select name="dialog_select" id="dialog_selector"\n
+            <select name="select_dialog" id="dialog_selector"\n
                     tal:attributes="onChange string:submitAction(this.form,\'${url}/Base_doDialog\')">\n
               <tal:block tal:repeat="action dialog_actions">\n
                 <option tal:attributes="value action/url;\n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision?rev=8806&r1=8805&r2=8806&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision Wed Jul 26 16:07:43 2006
@@ -1,1 +1,1 @@
-43
+45