From e71cb3a17382a9a7d810b2cf96e7a60a5de3039c Mon Sep 17 00:00:00 2001 From: "Vaibhav (OpenERP)" Date: Mon, 26 Dec 2011 16:17:25 +0530 Subject: [FIX] translation,return on no export. lp bug: https://launchpad.net/bugs/908723 fixed bzr revid: vda@tinyerp.com-20111226104725-0ob6e71f8elppu95 --- addons/web/static/src/js/data_export.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'addons/web/static/src/js/data_export.js') diff --git a/addons/web/static/src/js/data_export.js b/addons/web/static/src/js/data_export.js index 78dc3bef1f9..2b30a40d536 100644 --- a/addons/web/static/src/js/data_export.js +++ b/addons/web/static/src/js/data_export.js @@ -114,7 +114,7 @@ openerp.web.DataExport = openerp.web.Dialog.extend({ if (value) { self.do_save_export_list(value); } else { - alert("Pleae Enter Save Field List Name"); + alert(_t("Please Enter Save Field List Name")); } }); } else { @@ -349,19 +349,19 @@ openerp.web.DataExport = openerp.web.Dialog.extend({ export_field.push($(this).val()); }); if (!export_field.length) { - alert('Please select fields to save export list...'); + alert(_t('Please select fields to save export list...')); } return export_field; }, on_click_export_data: function() { - $.blockUI(this.$element); + var exported_fields = [], self = this; this.$element.find("#fields_list option").each(function() { var fieldname = self.records[$(this).val()]; exported_fields.push({name: fieldname, label: $(this).text()}); }); if (_.isEmpty(exported_fields)) { - alert('Please select fields to export...'); + alert(_t('Please select fields to export...')); return; } @@ -369,6 +369,7 @@ openerp.web.DataExport = openerp.web.Dialog.extend({ var export_format = this.$element.find("#export_format").val(); this.session.get_file({ url: '/web/export/' + export_format, + beforeSend: $.blockUI(this.$element), data: {data: JSON.stringify({ model: this.dataset.model, fields: exported_fields, -- cgit v1.2.3 From 9c85ae387ad389024a451120be134709a4e3611d Mon Sep 17 00:00:00 2001 From: "Vaibhav (OpenERP)" Date: Tue, 10 Jan 2012 18:29:14 +0530 Subject: [FIX] block ui before rpc call. bzr revid: vda@tinyerp.com-20120110125914-04oy2rilkdq793w0 --- addons/web/static/src/js/data_export.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'addons/web/static/src/js/data_export.js') diff --git a/addons/web/static/src/js/data_export.js b/addons/web/static/src/js/data_export.js index 2b30a40d536..ab7ea5e6163 100644 --- a/addons/web/static/src/js/data_export.js +++ b/addons/web/static/src/js/data_export.js @@ -114,7 +114,7 @@ openerp.web.DataExport = openerp.web.Dialog.extend({ if (value) { self.do_save_export_list(value); } else { - alert(_t("Please Enter Save Field List Name")); + alert(_t("Please enter save field list name")); } }); } else { @@ -354,7 +354,6 @@ openerp.web.DataExport = openerp.web.Dialog.extend({ return export_field; }, on_click_export_data: function() { - var exported_fields = [], self = this; this.$element.find("#fields_list option").each(function() { var fieldname = self.records[$(this).val()]; @@ -367,9 +366,9 @@ openerp.web.DataExport = openerp.web.Dialog.extend({ exported_fields.unshift({name: 'id', label: 'External ID'}); var export_format = this.$element.find("#export_format").val(); + $.blockUI(); this.session.get_file({ url: '/web/export/' + export_format, - beforeSend: $.blockUI(this.$element), data: {data: JSON.stringify({ model: this.dataset.model, fields: exported_fields, -- cgit v1.2.3 From e9ca86dd63a8b6c89ed4f9b263ae98bbe9be52a2 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 10 Jan 2012 17:54:51 +0100 Subject: [IMP] More dataset refactoring bzr revid: fme@openerp.com-20120110165451-pvchn668y0b1p645 --- addons/web/static/src/js/data_export.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/web/static/src/js/data_export.js') diff --git a/addons/web/static/src/js/data_export.js b/addons/web/static/src/js/data_export.js index c6fe96432ea..1382bf841de 100644 --- a/addons/web/static/src/js/data_export.js +++ b/addons/web/static/src/js/data_export.js @@ -74,7 +74,7 @@ openerp.web.DataExport = openerp.web.Dialog.extend({ } return this.exports.read_slice(['name'], { domain: [['resource', '=', this.dataset.model]] - }, function (export_list) { + }).then(function (export_list) { if (!export_list.length) { return; } -- cgit v1.2.3 From c89d45b6583023d28735d4e17762165d10edf493 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 13 Jan 2012 10:06:11 +0100 Subject: [IMP] display a warning and disable excel export option when XLWT is not installed lp bug: https://launchpad.net/bugs/915347 fixed bzr revid: xmo@openerp.com-20120113090611-lmiu5y7y7b9td8hg --- addons/web/static/src/js/data_export.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'addons/web/static/src/js/data_export.js') diff --git a/addons/web/static/src/js/data_export.js b/addons/web/static/src/js/data_export.js index 1382bf841de..1268ac67fa5 100644 --- a/addons/web/static/src/js/data_export.js +++ b/addons/web/static/src/js/data_export.js @@ -63,7 +63,15 @@ openerp.web.DataExport = openerp.web.Dialog.extend({ do_setup_export_formats: function (formats) { var $fmts = this.$element.find('#export_format'); _(formats).each(function (format) { - $fmts.append(new Option(format[1], format[0])); + var opt = new Option(format.label, format.tag); + if (format.error) { + opt.disabled = true; + opt.replaceChild( + document.createTextNode( + _.str.sprintf("%s — %s", format.label, format.error)), + opt.childNodes[0]) + } + $fmts.append(opt); }); }, show_exports_list: function() { -- cgit v1.2.3 From 33b25edc78702a1c11f14f912c2eafed4e0ed5ac Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 16 Jan 2012 10:53:37 +0100 Subject: [FIX] fetching of export data after reloading from saved list in a different mode than original If a field name can not be found in the `records` mapping, use it as-is. May fail in some cases (for nested id fields) but will generally work better when reloading a list created in "all" mode while in "export compatible" mode, as there may be saved fields missing from the currently available list. Better fixes would be: * Ignore (gray out?) unavailable fields for this mode (and re-allow when the mode changes) * Display an error message of some sort and refuse to load the list * Pre-load all export lists and filter selectable ones by mode lp bug: https://launchpad.net/bugs/915245 fixed bzr revid: xmo@openerp.com-20120116095337-ko0y6xha6oqx4vw1 --- addons/web/static/src/js/data_export.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'addons/web/static/src/js/data_export.js') diff --git a/addons/web/static/src/js/data_export.js b/addons/web/static/src/js/data_export.js index 1268ac67fa5..f065c996abe 100644 --- a/addons/web/static/src/js/data_export.js +++ b/addons/web/static/src/js/data_export.js @@ -362,11 +362,12 @@ openerp.web.DataExport = openerp.web.Dialog.extend({ return export_field; }, on_click_export_data: function() { - var exported_fields = [], self = this; - this.$element.find("#fields_list option").each(function() { - var fieldname = self.records[$(this).val()]; - exported_fields.push({name: fieldname, label: $(this).text()}); - }); + var exported_fields = this.$element.find('#fields_list option').map(function () { + // DOM property is textContent, but IE8 only knows innerText + return {name: this.value, + label: this.textContent || this.innerText}; + }).get(); + if (_.isEmpty(exported_fields)) { alert(_t("Please select fields to export...")); return; @@ -383,7 +384,7 @@ openerp.web.DataExport = openerp.web.Dialog.extend({ ids: this.dataset.ids, domain: this.dataset.domain, import_compat: Boolean( - this.$element.find("#import_compat").val()) + this.$element.find("#import_compat").val()) })}, complete: $.unblockUI }); -- cgit v1.2.3 From d09c6bcfe558c2566820d625b347cd0813a4c2f6 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 16 Jan 2012 11:16:31 +0100 Subject: [FIX] small issue in xmo@openerp.com-20120116095337-ko0y6xha6oqx4vw1 bzr revid: xmo@openerp.com-20120116101631-ln5oa2fdlt670rqi --- addons/web/static/src/js/data_export.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'addons/web/static/src/js/data_export.js') diff --git a/addons/web/static/src/js/data_export.js b/addons/web/static/src/js/data_export.js index f065c996abe..78be735edc7 100644 --- a/addons/web/static/src/js/data_export.js +++ b/addons/web/static/src/js/data_export.js @@ -362,7 +362,9 @@ openerp.web.DataExport = openerp.web.Dialog.extend({ return export_field; }, on_click_export_data: function() { + var self = this; var exported_fields = this.$element.find('#fields_list option').map(function () { + var name = self.records[this.value] || this.value // DOM property is textContent, but IE8 only knows innerText return {name: this.value, label: this.textContent || this.innerText}; -- cgit v1.2.3