[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:
parent
a9446c53f9
commit
4c31251a43
|
@ -1361,7 +1361,7 @@ class Reports(View):
|
||||||
return False
|
return False
|
||||||
|
|
||||||
class Import(View):
|
class Import(View):
|
||||||
_cp_path = "/base/import"
|
_cp_path = "/web/import"
|
||||||
|
|
||||||
def fields_get(self, req, model):
|
def fields_get(self, req, model):
|
||||||
Model = req.session.model(model)
|
Model = req.session.model(model)
|
||||||
|
@ -1414,7 +1414,7 @@ class Import(View):
|
||||||
all_fields = fields.keys()
|
all_fields = fields.keys()
|
||||||
|
|
||||||
try:
|
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:
|
except:
|
||||||
error={'message': 'error opening .CSV file. Input Error.'}
|
error={'message': 'error opening .CSV file. Input Error.'}
|
||||||
return simplejson.dumps({'error':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,)}
|
error = {'message':('Error processing the first line of the file. Field "%s" is unknown') % (word,)}
|
||||||
|
|
||||||
if error:
|
if error:
|
||||||
params.get('csvfile').file.seek(0)
|
params.get('csvfile').seek(0)
|
||||||
error=dict(error, preview=params.get('csvfile').file.read(200))
|
error=dict(error, preview=params.get('csvfile').read(200))
|
||||||
return simplejson.dumps({'error':error})
|
return simplejson.dumps({'error':error})
|
||||||
|
|
||||||
return simplejson.dumps({'records':records[1:],'header':fields,'all_fields':all_fields,'req_field':req_field})
|
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)
|
context = req.session.eval_context(req.context)
|
||||||
modle_obj = req.session.model(params.get('model'))
|
modle_obj = req.session.model(params.get('model'))
|
||||||
res = None
|
res = None
|
||||||
content = params.get('csvfile').file.read()
|
content = params.get('csvfile').read()
|
||||||
input=StringIO.StringIO(content)
|
input=StringIO.StringIO(content)
|
||||||
limit = 0
|
limit = 0
|
||||||
data = []
|
data = []
|
||||||
|
|
|
@ -56,7 +56,7 @@ openerp.web = function(instance) {
|
||||||
openerp.web.formats(instance);
|
openerp.web.formats(instance);
|
||||||
openerp.web.chrome(instance);
|
openerp.web.chrome(instance);
|
||||||
openerp.web.data(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++) {
|
for(var i=0; i<files.length; i++) {
|
||||||
if(openerp.web[files[i]]) {
|
if(openerp.web[files[i]]) {
|
||||||
openerp.web[files[i]](instance);
|
openerp.web[files[i]](instance);
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
openerp.base.data_import = function(openerp) {
|
openerp.web.data_import = function(openerp) {
|
||||||
openerp.base.DataImport = openerp.base.Dialog.extend({
|
openerp.web.DataImport = openerp.web.Dialog.extend({
|
||||||
init: function(parent, dataset){
|
init: function(parent, dataset){
|
||||||
this.parent = parent;
|
this.parent = parent;
|
||||||
this._super(parent);
|
this._super(parent);
|
||||||
|
@ -35,7 +35,7 @@ openerp.base.DataImport = openerp.base.Dialog.extend({
|
||||||
var self = this;
|
var self = this;
|
||||||
if(!this.$element.find('#csvfile').val()) { return; }
|
if(!this.$element.find('#csvfile').val()) { return; }
|
||||||
this.$element.find('#import_data').attr({
|
this.$element.find('#import_data').attr({
|
||||||
'action': '/base/import/import_data'
|
'action': '/web/import/import_data'
|
||||||
}).ajaxSubmit({
|
}).ajaxSubmit({
|
||||||
success: this.on_import_results
|
success: this.on_import_results
|
||||||
});
|
});
|
||||||
|
@ -48,7 +48,7 @@ openerp.base.DataImport = openerp.base.Dialog.extend({
|
||||||
}
|
}
|
||||||
if(!this.$element.find('#csvfile').val()) { return; }
|
if(!this.$element.find('#csvfile').val()) { return; }
|
||||||
this.$element.find('#import_data').attr({
|
this.$element.find('#import_data').attr({
|
||||||
'action': '/base/import/detect_data'
|
'action': '/web/import/detect_data'
|
||||||
}).ajaxSubmit({
|
}).ajaxSubmit({
|
||||||
success: this.on_import_results
|
success: this.on_import_results
|
||||||
});
|
});
|
||||||
|
|
|
@ -247,7 +247,7 @@ openerp.web.ViewManager = openerp.web.Widget.extend({
|
||||||
},
|
},
|
||||||
/**
|
/**
|
||||||
* Event launched when a controller has been inited.
|
* Event launched when a controller has been inited.
|
||||||
*
|
*
|
||||||
* @param {String} view_type type of view
|
* @param {String} view_type type of view
|
||||||
* @param {String} view the inited controller
|
* @param {String} view the inited controller
|
||||||
*/
|
*/
|
||||||
|
@ -324,7 +324,7 @@ openerp.web.ViewManagerAction = openerp.web.ViewManager.extend({
|
||||||
|
|
||||||
var searchview_loaded = this.setup_search_view(
|
var searchview_loaded = this.setup_search_view(
|
||||||
searchview_id || false, search_defaults);
|
searchview_id || false, search_defaults);
|
||||||
|
|
||||||
// schedule auto_search
|
// schedule auto_search
|
||||||
if (searchview_loaded != null && this.action['auto_search']) {
|
if (searchview_loaded != null && this.action['auto_search']) {
|
||||||
$.when(searchview_loaded, inital_view_loaded)
|
$.when(searchview_loaded, inital_view_loaded)
|
||||||
|
@ -668,13 +668,13 @@ openerp.web.View = openerp.web.Widget.extend({
|
||||||
return this.rpc('/web/action/load', { action_id: parseInt(action_data.name, 10), context: context }, handler);
|
return this.rpc('/web/action/load', { action_id: parseInt(action_data.name, 10), context: context }, handler);
|
||||||
} else {
|
} else {
|
||||||
return dataset.exec_workflow(record_id, action_data.name, handler);
|
return dataset.exec_workflow(record_id, action_data.name, handler);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
/**
|
/**
|
||||||
* Directly set a view to use instead of calling fields_view_get. This method must
|
* Directly set a view to use instead of calling fields_view_get. This method must
|
||||||
* be called before start(). When an embedded view is set, underlying implementations
|
* be called before start(). When an embedded view is set, underlying implementations
|
||||||
* of openerp.web.View must use the provided view instead of any other one.
|
* of openerp.web.View must use the provided view instead of any other one.
|
||||||
*
|
*
|
||||||
* @param embedded_view A view.
|
* @param embedded_view A view.
|
||||||
*/
|
*/
|
||||||
set_embedded_view: function(embedded_view) {
|
set_embedded_view: function(embedded_view) {
|
||||||
|
@ -732,7 +732,7 @@ openerp.web.View = openerp.web.Widget.extend({
|
||||||
this.log('Todo');
|
this.log('Todo');
|
||||||
},
|
},
|
||||||
on_sidebar_import: function() {
|
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);
|
import_view.start(false);
|
||||||
},
|
},
|
||||||
on_sidebar_export: function() {
|
on_sidebar_export: function() {
|
||||||
|
|
Loading…
Reference in New Issue