Merge lp:~camptocamp/openobject-addons/trunk-fix-1223298 into lp:openobject-addons

[Yannick Vaucher @ Camptocamp]

Fix broken base_import due to signature mismatch in trunk

lp:1223298

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Tested and it fixes the broken import feature.

(I'm not the author of the fix)

review: Approve (test)

Unmerged revisions

9239. By Salton Massally on 2014-03-19

Fix import controller, request imported instead of being passed as argument. Courtesy of Salton Massally

=== modified file 'base_import/controllers.py'
--- base_import/controllers.py	2013-11-27 15:32:57 +0000
+++ base_import/controllers.py	2014-03-19 10:09:25 +0000
@@ -1,18 +1,18 @@
 # -*- coding: utf-8 -*-
 import simplejson
 
-from openerp.http import Controller, route
+from openerp.http import Controller, route, request
 
 class ImportController(Controller):
     @route('/base_import/set_file')
-    def set_file(self, req, file, import_id, jsonp='callback'):
+    def set_file(self, file, import_id, jsonp='callback'):
         import_id = int(import_id)
 
-        written = req.session.model('base_import.import').write(import_id, {
+        written = request.session.model('base_import.import').write(import_id, {
             'file': file.read(),
             'file_name': file.filename,
             'file_type': file.content_type,
-        }, req.context)
+        }, request.context)
 
         return 'window.top.%s(%s)' % (
             jsonp, simplejson.dumps({'result': written}))