Merge lp:~openerp-dev/openobject-client-web/6.0-opw-55168-msh into lp:openobject-client-web

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of cherrypy version, the version of cherrypy > 3.1.2 is causing following problem.

Just run populate.sh which will install latest version cherrypy due to which following issue is faced.

Issue - 1 create group by of any list view and try to expan the groups.

Issue - 2 Go to HR -> Employee -> edit any employee -> change the photo -> save it, binary data will not be saved.

Fixed the issue to make fix cherrypy less than 3.1.2, if we use cherrypy <= 3.1.2 then it works smoothly, cherrypy greater than 3.1.2 creates many problems.

Thanks.

[Mohammed Shekha(Open ERP) (msh-openerp)]

Hello,

The issue has been fixed in https://code.launchpad.net/~openerp-dev/openobject-client-web/6.0-opw-574491-xal/+merge/104766.

Hence abstain this branch.

Thanks.

[Xavier ALT (dex-phx)]

Hi,

Group by problem was fixed, but saving binary field with cherrypy >= 3.2.X are still broken.

Fact is, cherrpy >= 3.2.X are wrapping POST binary content inside cherrypy._cpreqbody.Part class, whereas the web client currently only take cgi.FieldStorage class into account. I will fix that before merging it.

Cheers,
Xavier

[lp:~openerp-dev/openobject-client-web/6.0-opw-55168-msh]

4762. By Xavier ALT on 2012-06-21

[FIX] web: fix saving of binary fields with cherrypy >= 3.2.X

=== modified file 'addons/openerp/validators.py'
--- addons/openerp/validators.py	2012-01-06 11:29:16 +0000
+++ addons/openerp/validators.py	2012-06-21 19:10:25 +0000
@@ -25,6 +25,15 @@
 import re
 import time
 
+BINARY_FIELD_STORAGE_CLASS = cgi.FieldStorage
+try:
+    # binary data send/get with cherrypy >= 3.2.X
+    # are wrapper inside 'Part' class
+    from cherrypy._cpreqbody import Part
+    BINARY_FIELD_STORAGE_CLASS = ( cgi.FieldStorage, Part )
+except ImportError:
+    pass
+
 import formencode.validators
 import formencode.api
 
@@ -159,7 +168,7 @@
         if isinstance(value, list):
             value = value[0]
 
-        if isinstance(value, cgi.FieldStorage):
+        if isinstance(value, BINARY_FIELD_STORAGE_CLASS):
             if value.filename:
                 return base64.encodestring(value.file.read())
             elif self.not_empty:

=== modified file 'lib/populate.sh'
--- lib/populate.sh	2009-11-06 12:53:43 +0000
+++ lib/populate.sh	2012-06-21 19:10:25 +0000
@@ -6,7 +6,7 @@
     test $2 || PYTHONPATH=. easy_install -a -Z -d . $1
 }
 
-install "CherryPy>=3.1.2" "-d cherrypy"
+install "CherryPy<=3.1.2" "-d cherrypy"
 install "Babel>=0.9.4" "-d babel"
 install "Mako>=0.2.4" "-d mako"
 install "simplejson>=2.0.9" "-d simplejson"