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

[FIX]Fixed code as par rename web from base and read file data problem. 

bzr revid: kch@tinyerp.com-20110906130525-axb8e40gc1zya9a3
This commit is contained in:
Kunal Chavda (OpenERP) 2011-09-06 18:35:25 +05:30
parent a9446c53f9
commit 4c31251a43
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1361,7 +1361,7 @@ class Reports(View):
return False
class Import(View):
_cp_path = "/base/import"
_cp_path = "/web/import"
def fields_get(self, req, model):
Model = req.session.model(model)
@ -1414,7 +1414,7 @@ class Import(View):
all_fields = fields.keys()
try:
data = csv.reader(params.get('csvfile').file, quotechar=str(params.get('csvdel')), delimiter=str(params.get('csvsep')))
data = csv.reader(params.get('csvfile'), quotechar=str(params.get('csvdel')), delimiter=str(params.get('csvsep')))
except:
error={'message': 'error opening .CSV file. Input Error.'}
return simplejson.dumps({'error':error})
@ -1449,8 +1449,8 @@ class Import(View):
error = {'message':('Error processing the first line of the file. Field "%s" is unknown') % (word,)}
if error:
params.get('csvfile').file.seek(0)
error=dict(error, preview=params.get('csvfile').file.read(200))
params.get('csvfile').seek(0)
error=dict(error, preview=params.get('csvfile').read(200))
return simplejson.dumps({'error':error})
return simplejson.dumps({'records':records[1:],'header':fields,'all_fields':all_fields,'req_field':req_field})
@ -1466,7 +1466,7 @@ class Import(View):
context = req.session.eval_context(req.context)
modle_obj = req.session.model(params.get('model'))
res = None
content = params.get('csvfile').file.read()
content = params.get('csvfile').read()
input=StringIO.StringIO(content)
limit = 0
data = []

2
addons/web/static/src/js/boot.js
View File

@ -56,7 +56,7 @@ openerp.web = function(instance) {
openerp.web.formats(instance);
openerp.web.chrome(instance);
openerp.web.data(instance);
var files = ["views","search","list","form","list_editable","web_mobile","view_tree","data_export"];
var files = ["views","search","list","form","list_editable","web_mobile","view_tree","data_export","data_import"];
for(var i=0; i<files.length; i++) {
if(openerp.web[files[i]]) {
openerp.web[files[i]](instance);

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

@ -1,5 +1,5 @@
openerp.base.data_import = function(openerp) {
openerp.base.DataImport = openerp.base.Dialog.extend({
openerp.web.data_import = function(openerp) {
openerp.web.DataImport = openerp.web.Dialog.extend({
init: function(parent, dataset){
this.parent = parent;
this._super(parent);
@ -35,7 +35,7 @@ openerp.base.DataImport = openerp.base.Dialog.extend({
var self = this;
if(!this.$element.find('#csvfile').val()) { return; }
this.$element.find('#import_data').attr({
'action': '/base/import/import_data'
'action': '/web/import/import_data'
}).ajaxSubmit({
success: this.on_import_results
});
@ -48,7 +48,7 @@ openerp.base.DataImport = openerp.base.Dialog.extend({
}
if(!this.$element.find('#csvfile').val()) { return; }
this.$element.find('#import_data').attr({
'action': '/base/import/detect_data'
'action': '/web/import/detect_data'
}).ajaxSubmit({
success: this.on_import_results
});

2
addons/web/static/src/js/views.js
View File

@ -732,7 +732,7 @@ openerp.web.View = openerp.web.Widget.extend({
this.log('Todo');
},
on_sidebar_import: function() {
var import_view = new openerp.base.DataImport(this, this.dataset);
var import_view = new openerp.web.DataImport(this, this.dataset);
import_view.start(false);
},
on_sidebar_export: function() {