pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] lift import_compat and parent_field_type as direct kwargs to Export.get_fields, from contents to the params mapping

Browse Source 
bzr revid: xmo@openerp.com-20110831111201-g0c5qpld5zjyafnk
This commit is contained in:
Xavier Morel
2011-08-31 13:12:01 +02:00
parent cf3a910e73
commit cf4d17aa60
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/base/controllers/main.py
+2 -4
View File
@@ -1086,11 +1086,9 @@ class Export(View):
return fields
@openerpweb.jsonrequest
def get_fields(self, req, model, prefix='', name= '', params={}):
import_compat = params.get("import_compat", False)
def get_fields(self, req, model, prefix='', name= '',
import_compat=True, field_parent_type=None):
fields = self.fields_get(req, model)
field_parent_type = params.get("parent_field_type",False)
if import_compat and field_parent_type and field_parent_type == "many2one":
fields = {}
addons/base/static/src/js/data_export.js
+3 -6
View File
@@ -54,7 +54,7 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
if (import_comp) {
self.rpc("/base/export/get_fields", {
model: self.dataset.model,
params: { import_compat: parseInt(import_comp, 10) }
import_compat: parseInt(import_comp, 10)
}, function (records) {
got_fields.resolve();
self.on_show_data(records);
@@ -184,15 +184,12 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
if (self.$element.find("tr[id='treerow-" + self.field_id +"']").find('img').attr('src') === '/base/static/src/img/expand.gif') {
if (model) {
var import_comp = self.$element.find("#import_compat option:selected").val();
var params = {
import_compat: parseInt(import_comp),
parent_field_type : record['field_type']
};
self.rpc("/base/export/get_fields", {
model: model,
prefix: prefix,
name: name,
params: params
import_compat: parseInt(import_comp, 10),
parent_field_type : record['field_type']
}, function(results) {
self.on_show_data(results);
});