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

[IMP] make 'import compatible' an actual boolean, not a boolean-ish non-bool 

bzr revid: xmo@openerp.com-20110831112854-kczxaj3v79vx32ya
This commit is contained in:
Xavier Morel 2011-08-31 13:28:54 +02:00
parent cf4d17aa60
commit e99c627d7f
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
addons/base/static/src/js/data_export.js
View File

@ -50,16 +50,14 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
this.$element.find('#import_compat').change(function() { this.$element.find('#import_compat').change(function() {
self.$element.find('#fields_list').empty(); self.$element.find('#fields_list').empty();
self.$element.find('#field-tree-structure').remove(); self.$element.find('#field-tree-structure').remove();
var import_comp = self.$element.find("#import_compat option:selected").val(); var import_comp = self.$element.find("#import_compat").val();
if (import_comp) { self.rpc("/base/export/get_fields", {
self.rpc("/base/export/get_fields", { model: self.dataset.model,
model: self.dataset.model, import_compat: Boolean(import_comp)
import_compat: parseInt(import_comp, 10) }, function (records) {
}, function (records) { got_fields.resolve();
got_fields.resolve(); self.on_show_data(records);
self.on_show_data(records); });
});
}
}).change(); }).change();
return $.when( return $.when(
@ -183,12 +181,12 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
if (is_loaded == 0) { if (is_loaded == 0) {
if (self.$element.find("tr[id='treerow-" + self.field_id +"']").find('img').attr('src') === '/base/static/src/img/expand.gif') { if (self.$element.find("tr[id='treerow-" + self.field_id +"']").find('img').attr('src') === '/base/static/src/img/expand.gif') {
if (model) { if (model) {
var import_comp = self.$element.find("#import_compat option:selected").val(); var import_comp = self.$element.find("#import_compat").val();
self.rpc("/base/export/get_fields", { self.rpc("/base/export/get_fields", {
model: model, model: model,
prefix: prefix, prefix: prefix,
name: name, name: name,
import_compat: parseInt(import_comp, 10), import_compat: Boolean(import_comp),
parent_field_type : record['field_type'] parent_field_type : record['field_type']
}, function(results) { }, function(results) {
self.on_show_data(results); self.on_show_data(results);
@ -394,8 +392,8 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
fields: exported_fields, fields: exported_fields,
ids: this.dataset.ids, ids: this.dataset.ids,
domain: this.dataset.domain, domain: this.dataset.domain,
import_compat: parseInt( import_compat: Boolean(
this.$element.find("#import_compat").val(), 10) this.$element.find("#import_compat").val())
})}, })},
complete: $.unblockUI complete: $.unblockUI
}); });

4
addons/base/static/src/xml/base.xml
View File

@ -1233,8 +1233,8 @@
<td colspan="3"> <td colspan="3">
<label for="import_compat">Export Type:</label> <label for="import_compat">Export Type:</label>
<select id="import_compat" name="import_compat"> <select id="import_compat" name="import_compat">
<option value="1">Import Compatible Export</option> <option value="yes">Import Compatible Export</option>
<option value="0">Export all Data</option> <option value="">Export all Data</option>
</select> </select>
<label for="export_format">Export Formats</label> <label for="export_format">Export Formats</label>