Unifield Web

Merge lp:~unifield-team/unifield-web/uf1806 into lp:unifield-web

  1. uf1806
  2. Merge into trunk
Proposed by Samus CTO (OpenERP)
Status: Merged
Merged at revision: 4686
Proposed branch: lp:~unifield-team/unifield-web/uf1806
Merge into: lp:unifield-web
Diff against target: 24 lines (+6/-0)
1 file modified
addons/openerp/controllers/form.py (+6/-0)
To merge this branch: bzr merge lp:~unifield-team/unifield-web/uf1806
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+150026@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/form.py'
2--- addons/openerp/controllers/form.py 2012-11-28 15:18:44 +0000
3+++ addons/openerp/controllers/form.py 2013-02-22 11:53:21 +0000
4@@ -30,6 +30,8 @@
5 import openobject.paths
6 import simplejson
7
8+FIELDS_INTERNAL_NAME = '__openerp__real_fiels'
9+
10 def make_domain(name, value, kind='char'):
11 """A helper function to generate domain for the given name, value pair.
12 Will be used for search window...
13@@ -147,7 +149,11 @@
14 if k not in kw:
15 vals.pop(k)
16
17+ if 'fields' in vals:
18+ vals[FIELDS_INTERNAL_NAME] = vals.pop('fields')
19 form.validator = openobject.validators.Schema(**vals)
20+ if FIELDS_INTERNAL_NAME in vals:
21+ form.validator.fields['fields'] = form.validator.fields.pop(FIELDS_INTERNAL_NAME)
22 return form
23
24 def default_error_handler(self, tg_errors=None, **kw):

Subscribers

People subscribed via source and target branches

to all changes: