odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Safari seems to have issue with loading json data in iframes, implement a jsonp-ish system to correctly handle retrieval of import test return data 

bzr revid: xmo@openerp.com-20110909105307-2463mzr6micqdvbm
This commit is contained in:
Xavier Morel 2011-09-09 12:53:07 +02:00
parent ec6f367388
commit ea82b31286
2 changed files with 57 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
addons/web/controllers/main.py
View File

@ -1402,13 +1402,14 @@ class Import(View):
return fields
@openerpweb.httprequest
def detect_data(self, req, csvfile, csvsep, csvdel, csvcode, csvskip, **params):
def detect_data(self, req, model, csvfile, csvsep, csvdel, csvcode, csvskip,
jsonp):
_fields = {}
_fields_invert = {}
req_field = []
error = None
fields = req.session.model(params.get('model')).fields_get(False, req.session.eval_context(req.context))
fields = req.session.model(model).fields_get(False, req.session.eval_context(req.context))
fields.update({'id': {'string': 'ID'}, '.id': {'string': 'Database ID'}})
for field in fields:
@ -1450,7 +1451,8 @@ class Import(View):
data = csv.reader(csvfile, quotechar=str(csvdel), delimiter=str(csvsep))
except:
error={'message': 'error opening .CSV file. Input Error.'}
return simplejson.dumps({'error':error})
return '<script>window.top.%s(%s);</script>' % (
jsonp, simplejson.dumps({'error':error}))
records = []
count = 0
@ -1482,12 +1484,15 @@ class Import(View):
if error:
csvfile.seek(0)
error=dict(error, preview=csvfile.read(200))
return simplejson.dumps({'error':error})
return '<script>window.top.%s(%s);</script>' % (
jsonp, simplejson.dumps({'error':error}))
return simplejson.dumps({'records':records[1:],'header':header_fields,'all_fields':all_fields,'req_field':req_field})
return '<script>window.top.%s(%s);</script>' % (
jsonp, simplejson.dumps({'records':records[1:],'header':header_fields,'all_fields':all_fields,'req_field':req_field}))
@openerpweb.httprequest
def import_data(self, req, csvfile, csvsep, csvdel, csvcode, csvskip, **params):
def import_data(self, req, model, csvfile, csvsep, csvdel, csvcode, csvskip,
jsonp):
_fields = {}
_fields_invert = {}
@ -1495,7 +1500,7 @@ class Import(View):
prefix_value = ''
context = req.session.eval_context(req.context)
modle_obj = req.session.model(params.get('model'))
modle_obj = req.session.model(model)
res = None
limit = 0
@ -1503,7 +1508,8 @@ class Import(View):
if not (csvdel and len(csvdel) == 1):
error={'message': "The CSV delimiter must be a single character"}
return simplejson.dumps({'error':error})
return '<script>window.top.%s(%s);</script>' % (
jsonp, simplejson.dumps({'error':error}))
try:
data_record = csv.reader(csvfile, quotechar=str(csvdel), delimiter=str(csvsep))
@ -1515,7 +1521,8 @@ class Import(View):
except csv.Error, e:
error={'message': str(e),'title': 'File Format Error'}
return simplejson.dumps({'error':error})
return '<script>window.top.%s(%s);</script>' % (
jsonp, simplejson.dumps({'error':error}))
datas = []
ctx = context
@ -1538,7 +1545,8 @@ class Import(View):
if unmatch_field:
error = {'message':("You cannot import the fields '%s',because we cannot auto-detect it." % (unmatch_field))}
return simplejson.dumps({'error':error})
return '<script>window.top.%s(%s);</script>' % (
jsonp, simplejson.dumps({'error':error}))
for line in data[1:]:
try:
@ -1549,22 +1557,26 @@ class Import(View):
# If the file contains nothing,
if not datas:
error = {'message': 'The file is empty !', 'title': 'Importation !'}
return simplejson.dumps({'error':error})
return '<script>window.top.%s(%s);</script>' % (
jsonp, simplejson.dumps({'error':error}))
#Inverting the header into column names
try:
res = modle_obj.import_data(fields, datas, 'init', '', False, ctx)
except xmlrpclib.Fault, e:
error = {"message":e.faultCode}
return simplejson.dumps({'error':error})
return '<script>window.top.%s(%s);</script>' % (
jsonp, simplejson.dumps({'error':error}))
if res[0]>=0:
success={'message':'Imported %d objects' % (res[0],)}
return simplejson.dumps({'success':success})
return '<script>window.top.%s(%s);</script>' % (
jsonp, simplejson.dumps({'error':success}))
d = ''
for key,val in res[1].items():
d+= ('%s: %s' % (str(key),str(val)))
msg = 'Error trying to import this record:%s. ErrorMessage:%s %s' % (d,res[2],res[3])
error = {'message':str(msg), 'title':'ImportationError'}
return simplejson.dumps({'error':error})
return '<script>window.top.%s(%s);</script>' % (
jsonp, simplejson.dumps({'error':error}))

44
addons/web/static/src/js/data_import.js
View File

@ -1,5 +1,28 @@
openerp.web.data_import = function(openerp) {
var QWeb = openerp.web.qweb;
/**
* Safari does not deal well at all with raw JSON data being returned. As a
* result, we're going to cheat by using a pseudo-jsonp: instead of getting
* JSON data in the iframe, we're getting a ``script`` tag which consists of a
* function call and the returned data (the json dump).
*
* The function is an auto-generated name bound to ``window``, which calls
* back into the callback provided here.
*
* @param {Object} form the form element (DOM or jQuery) to use in the call
* @param {Object} attributes jquery.form attributes object
* @param {Function} callback function to call with the returned data
*/
function jsonp(form, attributes, callback) {
var options = {jsonp: _.uniqueId('import_callback_')};
window[options.jsonp] = function () {
delete window[options.jsonp];
callback.apply(null, arguments);
};
$(form).ajaxSubmit(_.extend({
data: options
}, attributes));
}
openerp.web.DataImport = openerp.web.Dialog.extend({
init: function(parent, dataset){
this.parent = parent;
@ -35,11 +58,9 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
do_import: function() {
var self = this;
if(!this.$element.find('#csvfile').val()) { return; }
this.$element.find('#import_data').attr({
'action': '/web/import/import_data'
}).ajaxSubmit({
success: this.on_import_results
});
jsonp(this.$element.find('#import_data'), {
url: '/web/import/import_data'
}, this.on_import_results);
},
on_autodetect_data: function() {
var self = this;
@ -48,17 +69,14 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
this.$element.find("#imported_success").css('display','none');
}
if(!this.$element.find('#csvfile').val()) { return; }
this.$element.find('#import_data').attr({
'action': '/web/import/detect_data'
}).ajaxSubmit({
success: this.on_import_results
});
jsonp(this.$element.find('#import_data'), {
url: '/web/import/detect_data'
}, this.on_import_results);
},
on_import_results:function(res){
on_import_results:function(results){
var self = this;
this.$element.find('#result, #success , #message').empty();
var results = $.parseJSON(res);
var result_node = $("#result");
var records = {};
@ -117,4 +135,4 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
this._super();
}
});
};
};