diff options
| author | Jiten (OpenERP) <jra@tinyerp.com> | 2011-10-25 11:43:27 +0530 |
|---|---|---|
| committer | Jiten (OpenERP) <jra@tinyerp.com> | 2011-10-25 11:43:27 +0530 |
| commit | 417cae1645d11ee173bbb2dcebe112009b520cd7 (patch) | |
| tree | 501bb01b6d8688258155661577669d85fe887879 /addons/web/controllers/main.py | |
| parent | 27598512e3e267d92a863c7df41974208ea8b554 (diff) | |
| parent | f097e140b8b51437258ae03000b37f1677f6098b (diff) | |
[Merge] Merge from openerp-web
bzr revid: bth@tinyerp.com-20111020062457-h4v2ud105ver5u5y
bzr revid: jra@tinyerp.com-20111025061327-v676oxmsx3xz66s3
Diffstat (limited to 'addons/web/controllers/main.py')
| -rw-r--r-- | addons/web/controllers/main.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 55e23aae979..6cc46b476a9 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -526,7 +526,7 @@ def fix_view_modes(action): if 'views' not in action: generate_views(action) - if action.pop('view_type') != 'form': + if action.pop('view_type', 'form') != 'form': return action action['views'] = [ @@ -1373,10 +1373,9 @@ class Reports(View): if 'report_type' in action: report_data['report_type'] = action['report_type'] if 'datas' in action: - if 'form' in action['datas']: - report_data['form'] = action['datas']['form'] if 'ids' in action['datas']: - report_ids = action['datas']['ids'] + report_ids = action['datas'].pop('ids') + report_data.update(action['datas']) report_id = report_srv.report( req.session._db, req.session._uid, req.session._password, @@ -1413,7 +1412,7 @@ class Import(View): return fields @openerpweb.httprequest - def detect_data(self, req, csvfile, csvsep, csvdel, csvcode, jsonp): + def detect_data(self, req, csvfile, csvsep=',', csvdel='"', csvcode='utf-8', jsonp='callback'): try: data = list(csv.reader( csvfile, quotechar=str(csvdel), delimiter=str(csvsep))) |