[Erp5-report] r38580 ivan - in /erp5/trunk/products/ERP5Form: ListBox.py tests/testListBox.py

[nobody at svn.erp5.org]

Author: ivan
Date: Thu Sep 23 11:03:08 2010
New Revision: 38580

URL: http://svn.erp5.org?rev=38580&view=rev
Log:
Propagandate current ERP5 form with leading prefix in case of listbox in order to not conflict with relation field.

Modified:
    erp5/trunk/products/ERP5Form/ListBox.py
    erp5/trunk/products/ERP5Form/tests/testListBox.py

Modified: erp5/trunk/products/ERP5Form/ListBox.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/ListBox.py?rev=38580&r1=38579&r2=38580&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/ListBox.py [utf8] (original)
+++ erp5/trunk/products/ERP5Form/ListBox.py [utf8] Thu Sep 23 11:03:08 2010
@@ -2620,8 +2620,8 @@ class ListBoxHTMLRenderer(ListBoxRendere
     request = self.request
     field_id = self.getId()
     form = self.getForm()
-    request.set('form_id', form.getId())
-    request.set('field_id', field_id)
+    request.set('listbox_form_id', form.getId())
+    request.set('listbox_field_id', field_id)
     pt = self.getPageTemplate()
     return pt()
 

Modified: erp5/trunk/products/ERP5Form/tests/testListBox.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/tests/testListBox.py?rev=38580&r1=38579&r2=38580&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/tests/testListBox.py [utf8] (original)
+++ erp5/trunk/products/ERP5Form/tests/testListBox.py [utf8] Thu Sep 23 11:03:08 2010
@@ -631,10 +631,10 @@ return []
     request = get_request()
     portal.ListBoxZuite_reset()
     form = portal.FooModule_viewFooList
-    self.assertEqual(None, request.get('form_id'))
+    self.assertEqual(None, request.get('listbox_form_id'))
     form.render()
-    self.assertEqual(form.getId(), request.get('form_id'))
-    self.assertEqual(form.listbox.getId(), request.get('field_id'))
+    self.assertEqual(form.getId(), request.get('listbox_form_id'))
+    self.assertEqual(form.listbox.getId(), request.get('listbox_field_id'))
 
 
 def test_suite():