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

[nobody at svn.erp5.org]

Author: vincent
Date: Fri Jul 28 18:34:09 2006
New Revision: 8880

URL: http://svn.erp5.org?rev=8880&view=rev
Log:
Fix propagating wrongly dialog variables (for exmaple, pass a workflow transition and then click save).
Fix default action name (must not contain :method, i'ts appended when rendered).

Modified:
    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/view_main.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/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=8880&r1=8879&r2=8880&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 Fri Jul 28 18:34:09 2006
@@ -91,13 +91,7 @@
 \n
 # erp5_xhtml_style special fields.\n
 # This is normal.\n
-for k in (\'came_from\', \'SearchableText\', \'portal_status_message\', \'reset\'):\n
-  if parameter_list.has_key(k):\n
-    del parameter_list[k]\n
-\n
-# erp5_xhtml_style special fields.\n
-# XXX: This should not be needed.\n
-for k in (\'update_action\', \'dialog_method\', \'cancel_method\'):\n
+for k in (\'came_from\', \'SearchableText\', \'portal_status_message\', \'reset\', \'dialog_id\', \'update_action\', \'dialog_method\', \'cancel_method\'):\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/view_main.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/view_main.xml?rev=8880&r1=8879&r2=8880&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/view_main.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/view_main.xml Fri Jul 28 18:34:09 2006
@@ -76,7 +76,7 @@
   <tal:block tal:define="object_uid here/getUid | nothing;\n
                          object_path here/getPath | nothing;\n
                          form_id form/id | nothing;\n
-                         form_action python: here.portal_membership.checkPermission(\'Modify portal content\', here) and \'Base_edit:method\' or nothing;\n
+                         form_action python: here.portal_membership.checkPermission(\'Modify portal content\', here) and \'Base_edit\' or nothing;\n
 \n
                          local_parameter_list local_parameter_list | python: {};\n
                          dummy python: local_parameter_list.update({\'object_uid\': object_uid, \'object_path\': object_path, \'form_id\': form_id});\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=8880&r1=8879&r2=8880&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision Fri Jul 28 18:34:09 2006
@@ -1,1 +1,1 @@
-48
+52