[Erp5-report] r29505 - in /erp5/trunk/products: ERP5/Document/ ERP5Form/tests/

[nobody at svn.erp5.org]

Author: jm
Date: Fri Oct  9 11:08:11 2009
New Revision: 29505

URL: http://svn.erp5.org?rev=29505&view=rev
Log:
Fix bug #1311 (get sizes of image displays from preferences)

In getSizeFromImageDisplay, accessors must be used without default 0 parameter
because it would override the default value from property sheet,
and the user may not have overriden these values in his preferences.

Add a unit test to test that behaviour of preference accessor.

Modified:
    erp5/trunk/products/ERP5/Document/Image.py
    erp5/trunk/products/ERP5Form/tests/testPreferences.py

Modified: erp5/trunk/products/ERP5/Document/Image.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Image.py?rev=29505&r1=29504&r2=29505&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Image.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Image.py [utf8] Fri Oct  9 11:08:11 2009
@@ -505,14 +505,14 @@
   def getSizeFromImageDisplay(self, image_display):
     """
     Return the size for this image display, or None if this image display name
-    is not known. If the preference is not set, (0, 0) is returned.
+    is not known.
     """
     if image_display in default_displays_id_list:
       preference_tool = self.getPortalObject().portal_preferences
       height_preference = 'preferred_%s_image_height' % (image_display,)
-      width_preferece = 'preferred_%s_image_width' % (image_display,)
-      height = preference_tool.getPreference(height_preference, 0)
-      width = preference_tool.getPreference(width_preferece, 0)
+      width_preference = 'preferred_%s_image_width' % (image_display,)
+      height = preference_tool.getPreference(height_preference)
+      width = preference_tool.getPreference(width_preference)
       return (height, width)
     return None
 

Modified: erp5/trunk/products/ERP5Form/tests/testPreferences.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/tests/testPreferences.py?rev=29505&r1=29504&r2=29505&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/tests/testPreferences.py [utf8] (original)
+++ erp5/trunk/products/ERP5Form/tests/testPreferences.py [utf8] Fri Oct  9 11:08:11 2009
@@ -457,6 +457,10 @@
                      preference_tool.getPreferredOoodocServerAddress('localhost'))
     self.assertEqual(default_large_image_height,
                      preference_tool.getPreferredLargeImageHeight())
+    # Default value passed by parameter has priority over the default in the
+    # property sheet.
+    self.assertEqual(large_image_height,
+                     preference_tool.getPreferredLargeImageHeight(large_image_height))
 
     # Members can't add new system preferences
     uf = self.getPortal().acl_users
@@ -491,6 +495,8 @@
                      preference_tool.getPreferredOoodocServerAddress('localhost'))
     self.assertEqual(large_image_height,
                      preference_tool.getPreferredLargeImageHeight())
+    self.assertEqual(large_image_height,
+                     preference_tool.getPreferredLargeImageHeight(0))
 
     # check a user can't edit preference which are marked for manager
     self.assertRaises(Unauthorized, user_pref.edit, preferred_ooodoc_server_address="localhost")