Unifield Web

Merge lp:~fabien-morin/unifield-web/fm-us-3381 into lp:unifield-web

  1. fm-us-3381
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4876
Proposed branch: lp:~fabien-morin/unifield-web/fm-us-3381
Merge into: lp:unifield-web
Diff against target: 63 lines (+14/-3)
3 files modified
addons/openerp/controllers/actions.py (+4/-2)
addons/openerp/controllers/form.py (+1/-1)
addons/openerp/controllers/templates/form.mako (+9/-0)
To merge this branch: bzr merge lp:~fabien-morin/unifield-web/fm-us-3381
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+331334@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/actions.py'
2--- addons/openerp/controllers/actions.py 2017-05-16 12:26:11 +0000
3+++ addons/openerp/controllers/actions.py 2017-09-26 07:32:39 +0000
4@@ -65,7 +65,7 @@
5 def execute_window(view_ids, model, res_id=False, domain=None, view_type='form', context=None,
6 mode='form,tree', name=None, target=None, limit=None, search_view=None,
7 context_menu=False, display_menu_tip=False, action_id=None,
8- sidebar_open=False):
9+ sidebar_open=False, auto_refresh=False):
10 """Performs `actions.act_window` action.
11
12 @param view_ids: view ids
13@@ -93,6 +93,7 @@
14 params['display_menu_tip'] = display_menu_tip
15 params['sidebar_open'] = sidebar_open
16 params['target'] = target or None
17+ params['auto_refresh'] = auto_refresh
18 cherrypy.request._terp_view_name = name or None
19 cherrypy.request._terp_view_target = target or None
20
21@@ -367,7 +368,8 @@
22 context_menu=data.get('context_menu'),
23 display_menu_tip=display_menu_tip,
24 action_id=action.get('id'),
25- sidebar_open=action.get('sidebar_open'))
26+ sidebar_open=action.get('sidebar_open'),
27+ auto_refresh=action.get('auto_refresh'))
28
29 def server(action, data):
30 context = dict(data.get('context', {}),
31
32=== modified file 'addons/openerp/controllers/form.py'
33--- addons/openerp/controllers/form.py 2017-05-18 12:24:22 +0000
34+++ addons/openerp/controllers/form.py 2017-09-26 07:32:39 +0000
35@@ -273,7 +273,7 @@
36 tips = tips
37
38 is_dashboard = form.screen.is_dashboard or False
39- return dict(form=form, pager=pager, buttons=buttons, path=self.path, can_shortcut=can_shortcut, shortcut_ids=shortcut_ids, display_name=display_name, title=title, tips=tips, obj_process=obj_process, is_dashboard=is_dashboard, sidebar_closed=params._terp_sidebar_closed, sidebar_open=params.sidebar_open)
40+ return dict(form=form, pager=pager, buttons=buttons, path=self.path, can_shortcut=can_shortcut, shortcut_ids=shortcut_ids, display_name=display_name, title=title, tips=tips, obj_process=obj_process, is_dashboard=is_dashboard, sidebar_closed=params._terp_sidebar_closed, sidebar_open=params.sidebar_open, auto_refresh=params.auto_refresh)
41
42 @expose('json', methods=('POST',))
43 def close_or_disable_tips(self):
44
45=== modified file 'addons/openerp/controllers/templates/form.mako'
46--- addons/openerp/controllers/templates/form.mako 2017-06-01 13:48:36 +0000
47+++ addons/openerp/controllers/templates/form.mako 2017-09-26 07:32:39 +0000
48@@ -25,6 +25,15 @@
49 /*
50 % endif
51 */
52+ /*
53+ % if auto_refresh :
54+ */
55+ setTimeout(function() {
56+ location.reload();
57+ }, ${auto_refresh}*1000);
58+ /*
59+ % endif
60+ */
61 setTimeout(function() {
62 jQuery('[autofocus="autofocus"]').focus();
63 }, 10);

Subscribers

People subscribed via source and target branches