Merge lp:~jfb-tempo-consulting/unifield-web/us-305 into lp:unifield-web

Proposed by jftempo
Status: Merged
Merged at revision: 4764
Proposed branch: lp:~jfb-tempo-consulting/unifield-web/us-305
Merge into: lp:unifield-web
Diff against target: 44 lines (+8/-1)
2 files modified
addons/openerp/controllers/templates/login.mako (+4/-0)
addons/openerp/controllers/utils.py (+4/-1)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-web/us-305
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+265560@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/templates/login.mako'
2--- addons/openerp/controllers/templates/login.mako 2015-05-15 07:47:35 +0000
3+++ addons/openerp/controllers/templates/login.mako 2015-07-22 16:02:18 +0000
4@@ -75,6 +75,10 @@
5 <div class="login_error_message" id="message">${message}</div>
6 % endif
7
8+ % if tz_offset:
9+ <div class="login_error_message" id="badregional">${tz_offset}</div>
10+ % endif
11+
12 % if bad_regional:
13 <div class="login_error_message" id="badregional">${bad_regional}</div>
14 % endif
15
16=== modified file 'addons/openerp/controllers/utils.py'
17--- addons/openerp/controllers/utils.py 2015-05-15 15:41:32 +0000
18+++ addons/openerp/controllers/utils.py 2015-07-22 16:02:18 +0000
19@@ -41,6 +41,8 @@
20 dblist = []
21
22 bad_regional = ''
23+ tz_offset = ''
24+
25 if os.name == 'nt':
26 try:
27 import _winreg
28@@ -54,6 +56,7 @@
29 pass
30 try:
31 dblist = rpc.session.listdb()
32+ tz_offset = rpc.session.gateway.execute_noauth('db', 'check_timezone')
33 except:
34 message = _("Could not connect to server")
35
36@@ -92,7 +95,7 @@
37 except:
38 pass
39 return dict(target=target, url=url, dblist=dblist, db=db, user=user, password=password,
40- action=action, message=message, origArgs=origArgs, info=info, bad_regional=bad_regional)
41+ action=action, message=message, origArgs=origArgs, info=info, bad_regional=bad_regional, tz_offset=tz_offset)
42
43 def secured(fn):
44 """A Decorator to make a SecuredController controller method secured.

Subscribers

People subscribed via source and target branches