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

[FIX] Renamed export module to data_export. export is a javascript reserved word thus causing problems with safari 

bzr revid: fme@openerp.com-20110728112013-lmo06h75r0xqipbo
This commit is contained in:
Fabien Meghazi 2011-07-28 13:20:13 +02:00
parent cf877c60ee
commit 0b04e6fa34
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/base/__openerp__.py
View File

@ -28,13 +28,13 @@
"static/src/js/list-editable.js",
"static/src/js/search.js",
"static/src/js/view_tree.js",
"static/src/js/export.js",
"static/src/js/data_export.js",
],
'css' : [
"static/lib/jquery.superfish/css/superfish.css",
"static/lib/jquery.ui/css/smoothness/jquery-ui-1.8.9.custom.css",
"static/lib/jquery.ui.notify/css/ui.notify.css",
"static/src/css/base.css",
"static/src/css/export.css",
"static/src/css/data_export.css",
],
}

0
addons/base/static/src/css/export.css → addons/base/static/src/css/data_export.css
View File

4
addons/base/static/src/js/boot.js
View File

@ -86,8 +86,8 @@ openerp.base = function(instance) {
if (openerp.base.view_tree) {
openerp.base.view_tree(instance);
}
if (openerp.base.export) {
openerp.base.export(instance);
if (openerp.base.data_export) {
openerp.base.data_export(instance);
}
};

4
addons/base/static/src/js/export.js → addons/base/static/src/js/data_export.js
View File

@ -1,5 +1,5 @@
openerp.base.export = function(openerp) {
openerp.base.Export = openerp.base.Dialog.extend({
openerp.base.data_export = function(openerp) {
openerp.base.DataExport = openerp.base.Dialog.extend({
init: function(parent, dataset, views){
this._super(parent);
this.dataset = dataset

2
addons/base/static/src/js/views.js
View File

@ -222,7 +222,7 @@ openerp.base.ViewManager = openerp.base.Controller.extend({
if(this.active_view == 'list' || this.active_view == 'form') {
this.views[this.active_view].controller.$element.after(QWeb.render('ExportView'))
this.$element.find('#exportview').click(function(ev) {
var export_view = new openerp.base.Export(self, self.dataset, self.views);
var export_view = new openerp.base.DataExport(self, self.dataset, self.views);
export_view.start(false);
ev.preventDefault();
});