Merge lp:~openerp-dev/openobject-client-web/trunk-bug-4396-sma into lp:openobject-client-web/trunk

[Sananaz (Open ERP)]

Hello,

Its maintenance case (ID:4396).
Description is:
Hello, i want change default language tu russian, but have an error:
A problem occurred in a Python script. Here is the sequence of function calls leading up to the error, in the order they occurred...
<type 'exceptions.ValueError'>: invalid literal for int() with base 10: '<email address hidden>'
args = ("invalid literal for int() with base 10: '<email address hidden>'",)
message = "invalid literal for int() with base 10: '<email address hidden>'"

Please Check with:
- Install Russian Language > Go to Preferences > Add Email Id with (<email address hidden>) and click on `OK`
- It gives traceback

Problem due to regular expression. I have resolve it with change the `re` of integer.
Also i have test with the bug(702568) for which we have used the `re`.
- https://bugs.launchpad.net/openobject-client-web/+bug/702568

Thank you.

[Xavier (Open ERP) (xmo-deactivatedaccount)]

See comments on the OPW 4311 merge proposals [0] [1]: we can merge 6.0 into trunk easily enough, so a single branch should be used (from 6.0) and either one or two merge proposals from there (if only one, to 6.0).

Closing this proposal and continuing in https://code.launchpad.net/~openerp-dev/openobject-client-web/6.0-opw-4396-sma/+merge/53227

[0] https://code.launchpad.net/~openerp-dev/openobject-client-web/6.0-opw-4311-sma/+merge/53439
[1] https://code.launchpad.net/~openerp-dev/openobject-client-web/trunk-bug-726491-sma/+merge/53438

review: Disapprove

Unmerged revisions

4615. By Sananaz (Open ERP) on 2011-03-14

[FIX] Fixed regular expression for integer when change preferences.

=== modified file 'addons/openerp/controllers/preferences.py'
--- addons/openerp/controllers/preferences.py	2011-02-10 16:09:23 +0000
+++ addons/openerp/controllers/preferences.py	2011-03-14 13:04:16 +0000
@@ -34,7 +34,7 @@
     action = "/openerp/pref/password"
     string = _('Change your password')
 
-int_pattern = re.compile(r'\d+')
+int_pattern = re.compile(r'^-{0,1}\d+$')
 class Preferences(Form):
 
     _cp_path = "/openerp/pref"