Unifield Web

Merge lp:~jfb-tempo-consulting/unifield-web/bklg-29 into lp:unifield-web

  1. bklg-29
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4753
Proposed branch: lp:~jfb-tempo-consulting/unifield-web/bklg-29
Merge into: lp:unifield-web
Diff against target: 53 lines (+13/-1)
3 files modified
addons/openerp/controllers/utils.py (+5/-1)
addons/openerp/po/messages/fr.po (+4/-0)
addons/openerp/utils/rpc.py (+4/-0)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-web/bklg-29
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+254246@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/openerp/controllers/utils.py'
2--- addons/openerp/controllers/utils.py 2011-01-17 11:57:11 +0000
3+++ addons/openerp/controllers/utils.py 2015-03-26 13:39:39 +0000
4@@ -125,7 +125,11 @@
5 password = kw.get('password', '')
6
7 # See if the user just tried to log in
8- if rpc.session.login(db, user, password) <= 0:
9+ login_ret = rpc.session.login(db, user, password)
10+ if action == 'login' and login_ret == -2:
11+ return login(cherrypy.request.path_info, message=_('Database newer than UniField version'),
12+ db=db, user=user, action=action, origArgs=get_orig_args(kw))
13+ elif login_ret <= 0:
14 # Bad login attempt
15 if action == 'login':
16 message = _("Bad username or password")
17
18=== modified file 'addons/openerp/po/messages/fr.po'
19--- addons/openerp/po/messages/fr.po 2013-02-07 15:11:59 +0000
20+++ addons/openerp/po/messages/fr.po 2015-03-26 13:39:39 +0000
21@@ -483,6 +483,10 @@
22 msgid "Could not connect to server"
23 msgstr "Impossible de se connecter au serveur"
24
25+#: controllers/utils.py:130
26+msgid "Database newer than UniField version"
27+msgstr "Base de données plus récente que la version d'UniField"
28+
29 #: controllers/utils.py:127 controllers/templates/login_ajax.mako:111
30 msgid "Bad username or password"
31 msgstr "Mauvais nom d'utilisateur ou mot de passe"
32
33=== modified file 'addons/openerp/utils/rpc.py'
34--- addons/openerp/utils/rpc.py 2014-08-19 12:09:47 +0000
35+++ addons/openerp/utils/rpc.py 2015-03-26 13:39:39 +0000
36@@ -130,6 +130,8 @@
37 common.concurrency(err.message, err.data, args)
38 else:
39 common.warning(err.data)
40+ elif err.code.startswith('updater.py'):
41+ common.error('updater.py', err.code)
42 elif err.code.startswith('AccessDenied'):
43 raise openobject.errors.AccessDenied(err.code, _('Access Denied'))
44 else:
45@@ -294,6 +296,8 @@
46 try:
47 uid = self.execute_noauth('common', 'login', db, user, password)
48 except Exception, e:
49+ if e.title == 'updater.py':
50+ return -2
51 return -1
52
53 if uid <= 0:

Subscribers

People subscribed via source and target branches