Odoo Web Client

Merge lp:~openerp-dev/openobject-client-web/missing-context into lp:openobject-client-web/trunk

  1. missing-context
  2. Merge into trunk
Proposed by Sananaz (Open ERP)
Status: Merged
Merged at revision: 4036
Proposed branch: lp:~openerp-dev/openobject-client-web/missing-context
Merge into: lp:openobject-client-web/trunk
Diff against target: 176 lines (+16/-16)
10 files modified
addons/openerp/controllers/actions.py (+2/-2)
addons/openerp/controllers/form.py (+3/-3)
addons/openerp/controllers/search.py (+2/-2)
addons/openerp/controllers/viewed.py (+1/-1)
addons/openerp/widgets/form/_m2o.py (+2/-2)
addons/openerp/widgets/form/_ref.py (+1/-1)
addons/openerp/widgets/listgrid.py (+1/-1)
addons/openerp/widgets/search.py (+2/-2)
addons/view_calendar/widgets/widgets.py (+1/-1)
addons/view_diagram/controllers/process.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-client-web/missing-context
Reviewer Review Type Date Requested Status
Navrang Oza (community) Approve
Review via email: mp+42908@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Navrang Oza (noz-tiny) wrote :

Added context to work translation properly.

review: Approve

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 2010-11-23 11:50:14 +0000
3+++ addons/openerp/controllers/actions.py 2010-12-07 05:14:41 +0000
4@@ -206,8 +206,8 @@
5 data['search_view'] = str(rpc.session.execute(
6 'object', 'execute', data['res_model'], 'fields_view_get',
7 data['search_view_id'], 'search', data['context']))
8- if not data.get('limit'):
9- data['limit'] = 50
10+ if data.get('limit'):
11+ data['limit'] = 20
12 view_ids = False
13 if action.get('views', []):
14 if isinstance(action['views'], list):
15
16=== modified file 'addons/openerp/controllers/form.py'
17--- addons/openerp/controllers/form.py 2010-12-02 12:33:49 +0000
18+++ addons/openerp/controllers/form.py 2010-12-07 05:14:41 +0000
19@@ -92,7 +92,7 @@
20 data = data or {}
21
22 proxy = rpc.RPCProxy(model)
23- fields = proxy.fields_get([], {})
24+ fields = proxy.fields_get([], rpc.session.context)
25
26 search_domain = domain[:]
27 search_data = {}
28@@ -255,7 +255,7 @@
29 display_name = {'field': form.screen.view['fields']['name']['string'], 'value': ustr(form.screen.view['fields']['name']['value'])}
30 title= ustr(display_name['field']) + ':' + ustr(display_name['value'])
31 elif params.view_type == 'diagram':
32- display_name = {'field': form.screen.view['fields']['name']['string'], 'value': rpc.RPCProxy(params.model).name_get(form.screen.id)[0][1]}
33+ display_name = {'field': form.screen.view['fields']['name']['string'], 'value': rpc.RPCProxy(params.model).name_get(form.screen.id, rpc.session.context)[0][1]}
34
35 # For Corporate Intelligence visibility.
36 obj_process = rpc.RPCProxy('ir.model').search([('model', '=', 'process.process')]) or None
37@@ -1049,7 +1049,7 @@
38 relation = v.get('relation')
39
40 if relation and kind in ('many2one', 'reference') and values.get(k):
41- values[k] = [values[k], rpc.name_get(relation, values[k])]
42+ values[k] = [values[k], rpc.name_get(relation, values[k], context)]
43
44 if kind == 'picture':
45 values[k] = generate_url_for_picture(model, k, ctx.id, values[k])
46
47=== modified file 'addons/openerp/controllers/search.py'
48--- addons/openerp/controllers/search.py 2010-12-07 04:29:10 +0000
49+++ addons/openerp/controllers/search.py 2010-12-07 05:14:41 +0000
50@@ -197,7 +197,7 @@
51
52 proxy = rpc.RPCProxy(model)
53 data = {}
54- res = proxy.fields_get()
55+ res = proxy.fields_get(False, rpc.session.context)
56
57 frm = {}
58 all_values = {}
59@@ -433,7 +433,7 @@
60
61 @expose('json')
62 def get_name(self, model, id):
63- return dict(name=rpc.name_get(model, id))
64+ return dict(name=rpc.name_get(model, id, rpc.session.context))
65
66 @expose('json')
67 def get_matched(self, model, text, limit=10, **kw):
68
69=== modified file 'addons/openerp/controllers/viewed.py'
70--- addons/openerp/controllers/viewed.py 2010-11-02 09:54:36 +0000
71+++ addons/openerp/controllers/viewed.py 2010-12-07 05:14:41 +0000
72@@ -189,7 +189,7 @@
73 parents.reverse()
74
75 for parent in parents:
76- field = rpc.RPCProxy(parent_model).fields_get([parent])
77+ field = rpc.RPCProxy(parent_model).fields_get([parent], rpc.session.context)
78
79 if field:
80 if field[parent].get('relation'):
81
82=== modified file 'addons/openerp/widgets/form/_m2o.py'
83--- addons/openerp/widgets/form/_m2o.py 2010-09-29 06:46:49 +0000
84+++ addons/openerp/widgets/form/_m2o.py 2010-12-07 05:14:41 +0000
85@@ -68,7 +68,7 @@
86 self.text = value
87 else:
88 self.default = value
89- self.text = rpc.name_get(self.relation, self.default)
90+ self.text = rpc.name_get(self.relation, self.default, rpc.session.context)
91
92 def update_params(self, d):
93 super(M2O, self).update_params(d)
94@@ -78,7 +78,7 @@
95 value = expr_eval(d['value'], {'context':rpc.session.context})
96 except:
97 value = d['value']
98- d['text'] = rpc.name_get(self.relation, value)
99+ d['text'] = rpc.name_get(self.relation, value, rpc.session.context)
100
101 register_widget(M2O, ["many2one"])
102
103
104=== modified file 'addons/openerp/widgets/form/_ref.py'
105--- addons/openerp/widgets/form/_ref.py 2010-09-20 11:27:34 +0000
106+++ addons/openerp/widgets/form/_ref.py 2010-12-07 05:14:41 +0000
107@@ -57,7 +57,7 @@
108 def set_value(self, value):
109 if value:
110 self.relation, self.default = value.split(",")
111- self.text = rpc.name_get(self.relation, self.default)
112+ self.text = rpc.name_get(self.relation, self.default, rpc.session.context)
113 else:
114 self.relation = ''
115 self.default = ''
116
117=== modified file 'addons/openerp/widgets/listgrid.py'
118--- addons/openerp/widgets/listgrid.py 2010-12-02 13:34:46 +0000
119+++ addons/openerp/widgets/listgrid.py 2010-12-07 05:14:41 +0000
120@@ -435,7 +435,7 @@
121 def get_text(self):
122
123 if isinstance(self.value, int):
124- self.value = self.value, rpc.name_get(self.attrs['relation'], self.value)
125+ self.value = self.value, rpc.name_get(self.attrs['relation'], self.value, rpc.session.context)
126
127 if self.value and len(self.value) > 0:
128 if isinstance(self.value, tuple):
129
130=== modified file 'addons/openerp/widgets/search.py'
131--- addons/openerp/widgets/search.py 2010-12-01 16:01:17 +0000
132+++ addons/openerp/widgets/search.py 2010-12-07 05:14:41 +0000
133@@ -255,7 +255,7 @@
134
135 self.fields_type = {}
136 self.fields = fields
137- all_fields = rpc.session.execute('object', 'execute', model, 'fields_get')
138+ all_fields = rpc.session.execute('object', 'execute', model, 'fields_get', rpc.session.context)
139 if len(fields) != len(all_fields):
140 common_fields = [f for f in all_fields if f in fields]
141 for f in common_fields:
142@@ -418,7 +418,7 @@
143
144 if kind == 'many2one' and model:
145 try:
146- value = rpc.name_get(model, default_search)
147+ value = rpc.name_get(model, default_search, self.context)
148 except Exception,e:
149 value = defval
150 defval = value or ''
151
152=== modified file 'addons/view_calendar/widgets/widgets.py'
153--- addons/view_calendar/widgets/widgets.py 2010-10-29 07:54:43 +0000
154+++ addons/view_calendar/widgets/widgets.py 2010-12-07 05:14:41 +0000
155@@ -373,7 +373,7 @@
156
157 if self.level:
158 field = self.level['link']
159- fields = rpc.RPCProxy(self.model).fields_get([field])
160+ fields = rpc.RPCProxy(self.model).fields_get([field], rpc.session.context)
161 self.fields.update(fields)
162
163 self.events = self.get_events(self.days)
164
165=== modified file 'addons/view_diagram/controllers/process.py'
166--- addons/view_diagram/controllers/process.py 2010-10-21 13:06:20 +0000
167+++ addons/view_diagram/controllers/process.py 2010-12-07 05:14:41 +0000
168@@ -48,7 +48,7 @@
169 selection = None
170 process_title = None
171
172- fields = rpc.RPCProxy(res_model).fields_get([], {})
173+ fields = rpc.RPCProxy(res_model).fields_get([], rpc.session.context)
174
175 help = _('Help: Not Defined')
176 help_ids = rpc.session.execute('object', 'execute', 'ir.actions.act_window', 'search', [('res_model','=',res_model)])