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

[IMP] Import :- improve code.

Browse Source 
bzr revid: ysa@tinyerp.com-20111017061602-6sv4m5ew70by57yx
This commit is contained in:
Yogesh (OpenERP)
2011-10-17 11:46:02 +05:30
parent 4d4e1a1f0e
commit 1e2e8ce9d1
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/js/data_import.js
+11 -12
View File
@@ -49,18 +49,12 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
});
};
this.ready = $.Deferred.queue().then(function () {
self.required_default_fields = _(self.fields).chain()
.filter(function (field) { return field.required; })
.pluck('id')
self.required_fields = _(self.fields).chain()
.filter(function (field) { return field.required && !_.include(self.fields_with_defaults, field.id); })
.pluck('name')
.value();
dataset.default_get(self.required_default_fields || [], function(res) {
self.required_fields = _(self.fields).chain()
.filter(function (field) {if( !(field.id in res)) return field.required; })
.pluck('name')
.value();
convert_fields(self);
self.all_fields.sort();
});
convert_fields(self);
self.all_fields.sort();
});
},
start: function() {
@@ -88,7 +82,12 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
this.ready.push(new openerp.web.DataSet(this, this.model).call(
'fields_get', [], function (fields) {
self.graft_fields(fields);
}));
self.ready.push(new openerp.web.DataSet(self, self.model).default_get(_.pluck(self.fields, 'id'), function (fields) {
self.fields_with_defaults = [];
_.each(fields, function(key, val) { if (key) { self.fields_with_defaults.push(val); } });
})
)
}));
},
graft_fields: function (fields, parent, level) {
parent = parent || this;