[Erp5-report] r43342 jerome - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: Skin...

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Feb 15 10:59:50 2011
New Revision: 43342

URL: http://svn.erp5.org?rev=43342&view=rev
Log:
ERP5Site_getCurrentDialogAction compares the action against the "normalized" url (ie. with shortest acquisition path), so actions that uses a more complex acquisition context are not matched. In that case, return the first action for which the dialog id matches with the one from the url

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ERP5Site_getCurrentDialogAction.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/ERP5Site_getCurrentDialogAction.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ERP5Site_getCurrentDialogAction.xml?rev=43342&r1=43341&r2=43342&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ERP5Site_getCurrentDialogAction.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ERP5Site_getCurrentDialogAction.xml [utf8] Tue Feb 15 10:59:50 2011
@@ -60,6 +60,11 @@ else:\n
   for action in dialog_actions:\n
     if current_url == action[\'url\'].split(\'?\')[0]:\n
       return action\n
+# still not found, return the first action with form_id matching\n
+form_id = current_url.split(\'/\')[-1]\n
+for action in dialog_actions:\n
+  if form_id == action[\'url\'].split(\'?\')[0].split(\'/\')[-1]:\n
+    return action\n
 return None\n
 </string> </value>
         </item>

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=43342&r1=43341&r2=43342&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision [utf8] Tue Feb 15 10:59:50 2011
@@ -1 +1 @@
-1060
\ No newline at end of file
+1061
\ No newline at end of file