From a0c192e8e0d49486de05010778a4a8c3ca4890f4 Mon Sep 17 00:00:00 2001 From: Adil Houmadi Date: Sat, 26 Jul 2014 13:57:10 +0200 Subject: [PATCH 1/7] Move plugin for __unported__ dir --- .../AUTHORS.txt | 0 .../__init__.py | 0 .../__openerp__.py | 24 ++++---- .../controllers.py | 33 ++++++----- .../i18n/de.po | 0 .../i18n/es.po | 0 .../i18n/fr.po | 0 .../i18n/is.po | 0 .../i18n/nl.po | 0 .../i18n/web_export_view.pot | 0 .../static/src}/js/web_advanced_export.js | 58 ++++++++++--------- .../static/src}/xml/web_advanced_export.xml | 2 +- 12 files changed, 61 insertions(+), 56 deletions(-) rename {__unported__/web_export_view => web_export_view}/AUTHORS.txt (100%) rename {__unported__/web_export_view => web_export_view}/__init__.py (100%) rename {__unported__/web_export_view => web_export_view}/__openerp__.py (81%) rename {__unported__/web_export_view => web_export_view}/controllers.py (67%) rename {__unported__/web_export_view => web_export_view}/i18n/de.po (100%) rename {__unported__/web_export_view => web_export_view}/i18n/es.po (100%) rename {__unported__/web_export_view => web_export_view}/i18n/fr.po (100%) rename {__unported__/web_export_view => web_export_view}/i18n/is.po (100%) rename {__unported__/web_export_view => web_export_view}/i18n/nl.po (100%) rename {__unported__/web_export_view => web_export_view}/i18n/web_export_view.pot (100%) rename {__unported__/web_export_view/static => web_export_view/static/src}/js/web_advanced_export.js (72%) rename {__unported__/web_export_view/static => web_export_view/static/src}/xml/web_advanced_export.xml (96%) diff --git a/__unported__/web_export_view/AUTHORS.txt b/web_export_view/AUTHORS.txt similarity index 100% rename from __unported__/web_export_view/AUTHORS.txt rename to web_export_view/AUTHORS.txt diff --git a/__unported__/web_export_view/__init__.py b/web_export_view/__init__.py similarity index 100% rename from __unported__/web_export_view/__init__.py rename to web_export_view/__init__.py diff --git a/__unported__/web_export_view/__openerp__.py b/web_export_view/__openerp__.py similarity index 81% rename from __unported__/web_export_view/__openerp__.py rename to web_export_view/__openerp__.py index 632c7ee41..37ab5ede2 100644 --- a/__unported__/web_export_view/__openerp__.py +++ b/web_export_view/__openerp__.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -############################################################################## +# ############################################################################# # -# Copyright (C) 2012 Domsense srl () -# Copyright (C) 2012-2013 Agile Business Group sagl +# Copyright (C) 2012 Domsense srl () +# Copyright (C) 2012-2013 Agile Business Group sagl # () # # This program is free software: you can redistribute it and/or modify @@ -47,13 +47,15 @@ the same data of the tree view you are looking at, headers included. 'author': 'Agile Business Group', 'website': 'http://www.agilebg.com', 'license': 'AGPL-3', - 'depends': ['web'], - # 'external_dependencies': { - # 'python': ['xlwt'], - # }, - 'js': ['static/*/*.js', 'static/*/js/*.js'], - 'qweb': ['static/xml/web_advanced_export.xml'], - 'installable': False, + 'depends': [ + 'web', + ], + 'js': [ + 'static/src/js/web_advanced_export.js', + ], + 'qweb': [ + 'static/src/xml/web_advanced_export.xml', + ], + 'installable': True, 'auto_install': False, - 'web_preload': False, } diff --git a/__unported__/web_export_view/controllers.py b/web_export_view/controllers.py similarity index 67% rename from __unported__/web_export_view/controllers.py rename to web_export_view/controllers.py index 01e3e1f93..82968ffe4 100644 --- a/__unported__/web_export_view/controllers.py +++ b/web_export_view/controllers.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -############################################################################## +# ############################################################################# # # Copyright (C) 2012 Agile Business Group sagl () # Copyright (C) 2012 Domsense srl () @@ -23,9 +23,10 @@ try: except ImportError: import simplejson as json -import web.http as openerpweb - -from web.controllers.main import ExcelExport +import openerp +import openerp.http as http +from openerp.http import request +from openerp.addons.web.controllers.main import ExcelExport class ExcelExportView(ExcelExport): @@ -36,19 +37,19 @@ class ExcelExportView(ExcelExport): raise AttributeError() return super(ExcelExportView, self).__getattribute__(name) - @openerpweb.httprequest - def index(self, req, data, token): + @http.route('/web/export/xls_view', type='json', auth='user') + def index(self, data, token): data = json.loads(data) model = data.get('model', []) columns_headers = data.get('headers', []) rows = data.get('rows', []) - - return req.make_response( - self.from_data(columns_headers, rows), - headers=[ - ('Content-Disposition', 'attachment; filename="%s"' - % self.filename(model)), - ('Content-Type', self.content_type) - ], - cookies={'fileToken': token} - ) + # + # return req.make_response( + # self.from_data(columns_headers, rows), + # headers=[ + # ('Content-Disposition', 'attachment; filename="%s"' + # % self.filename(model)), + # ('Content-Type', self.content_type) + # ], + # cookies={'fileToken': token} + # ) diff --git a/__unported__/web_export_view/i18n/de.po b/web_export_view/i18n/de.po similarity index 100% rename from __unported__/web_export_view/i18n/de.po rename to web_export_view/i18n/de.po diff --git a/__unported__/web_export_view/i18n/es.po b/web_export_view/i18n/es.po similarity index 100% rename from __unported__/web_export_view/i18n/es.po rename to web_export_view/i18n/es.po diff --git a/__unported__/web_export_view/i18n/fr.po b/web_export_view/i18n/fr.po similarity index 100% rename from __unported__/web_export_view/i18n/fr.po rename to web_export_view/i18n/fr.po diff --git a/__unported__/web_export_view/i18n/is.po b/web_export_view/i18n/is.po similarity index 100% rename from __unported__/web_export_view/i18n/is.po rename to web_export_view/i18n/is.po diff --git a/__unported__/web_export_view/i18n/nl.po b/web_export_view/i18n/nl.po similarity index 100% rename from __unported__/web_export_view/i18n/nl.po rename to web_export_view/i18n/nl.po diff --git a/__unported__/web_export_view/i18n/web_export_view.pot b/web_export_view/i18n/web_export_view.pot similarity index 100% rename from __unported__/web_export_view/i18n/web_export_view.pot rename to web_export_view/i18n/web_export_view.pot diff --git a/__unported__/web_export_view/static/js/web_advanced_export.js b/web_export_view/static/src/js/web_advanced_export.js similarity index 72% rename from __unported__/web_export_view/static/js/web_advanced_export.js rename to web_export_view/static/src/js/web_advanced_export.js index 36ba128a5..4b096b532 100644 --- a/__unported__/web_export_view/static/js/web_advanced_export.js +++ b/web_export_view/static/src/js/web_advanced_export.js @@ -19,27 +19,28 @@ // //############################################################################# -openerp.web_export_view = function(instance, m) { +openerp.web_export_view = function (instance) { + debugger; var _t = instance.web._t, - QWeb = instance.web.qweb; + QWeb = instance.web.qweb; instance.web.Sidebar.include({ - redraw: function() { + redraw: function () { var self = this; this._super.apply(this, arguments); self.$el.find('.oe_sidebar').append(QWeb.render('AddExportViewMain', {widget: self})); self.$el.find('.oe_sidebar_export_view_xls').on('click', self.on_sidebar_export_view_xls); }, - on_sidebar_export_view_xls: function() { + on_sidebar_export_view_xls: function () { // Select the first list of the current (form) view // or assume the main view is a list view and use that var self = this, - view = this.getParent(), - children = view.getChildren(); + view = this.getParent(), + children = view.getChildren(); if (children) { - children.every(function(child) { + children.every(function (child) { if (child.field && child.field.type == 'one2many') { view = child.viewmanager.views.list.controller; return false; // break out of the loop @@ -53,8 +54,8 @@ openerp.web_export_view = function(instance, m) { } export_columns_keys = []; export_columns_names = []; - $.each(view.visible_columns, function(){ - if(this.tag=='field'){ + $.each(view.visible_columns, function () { + if (this.tag == 'field') { // non-fields like `_group` or buttons export_columns_keys.push(this.id); export_columns_names.push(this.string); @@ -62,46 +63,47 @@ openerp.web_export_view = function(instance, m) { }); rows = view.$el.find('.oe_list_content > tbody > tr'); export_rows = []; - $.each(rows,function(){ + $.each(rows, function () { $row = $(this); // find only rows with data - if($row.attr('data-id')){ + if ($row.attr('data-id')) { export_row = []; checked = $row.find('th input[type=checkbox]').attr("checked"); - if (children && checked === "checked"){ - $.each(export_columns_keys,function(){ - cell = $row.find('td[data-field="'+this+'"]').get(0); + if (children && checked === "checked") { + $.each(export_columns_keys, function () { + cell = $row.find('td[data-field="' + this + '"]').get(0); text = cell.text || cell.textContent || cell.innerHTML || ""; - if (cell.classList.contains("oe_list_field_float")){ + if (cell.classList.contains("oe_list_field_float")) { export_row.push(instance.web.parse_value(text, {'type': "float"})); } - else if (cell.classList.contains("oe_list_field_boolean")){ - var data_id = $( '
' + cell.innerHTML + '
'); - if(data_id.find('input').get(0).checked){ - export_row.push(_t("True")); + else if (cell.classList.contains("oe_list_field_boolean")) { + var data_id = $('
' + cell.innerHTML + '
'); + if (data_id.find('input').get(0).checked) { + export_row.push(_t("True")); } else { - export_row.push(_t("False")); + export_row.push(_t("False")); } } - else if (cell.classList.contains("oe_list_field_integer")){ - export_row.push(parseInt(text)); + else if (cell.classList.contains("oe_list_field_integer")) { + export_row.push(parseInt(text)); } - else{ - export_row.push(text.trim()); + else { + export_row.push(text.trim()); } }); export_rows.push(export_row); - }; + } + ; } }); $.blockUI(); view.session.get_file({ url: '/web/export/xls_view', data: {data: JSON.stringify({ - model : view.model, - headers : export_columns_names, - rows : export_rows, + model: view.model, + headers: export_columns_names, + rows: export_rows, })}, complete: $.unblockUI }); diff --git a/__unported__/web_export_view/static/xml/web_advanced_export.xml b/web_export_view/static/src/xml/web_advanced_export.xml similarity index 96% rename from __unported__/web_export_view/static/xml/web_advanced_export.xml rename to web_export_view/static/src/xml/web_advanced_export.xml index cb4b50049..e5c48f5fe 100644 --- a/__unported__/web_export_view/static/xml/web_advanced_export.xml +++ b/web_export_view/static/src/xml/web_advanced_export.xml @@ -10,4 +10,4 @@ - + \ No newline at end of file From 5ecec620239c8492b68422c971720f20ecda26c1 Mon Sep 17 00:00:00 2001 From: Adil Houmadi Date: Sat, 26 Jul 2014 14:37:23 +0200 Subject: [PATCH 2/7] Migrate web_export_view to v 8.0 --- web_export_view/__init__.py | 4 +-- web_export_view/__openerp__.py | 15 +++++------ web_export_view/controllers/__init__.py | 21 +++++++++++++++ .../{ => controllers}/controllers.py | 27 +++++++++---------- ..._advanced_export.js => web_export_view.js} | 8 +++--- ...xport.xml => web_export_view_template.xml} | 3 +-- web_export_view/view/web_export_view.xml | 11 ++++++++ 7 files changed, 57 insertions(+), 32 deletions(-) create mode 100644 web_export_view/controllers/__init__.py rename web_export_view/{ => controllers}/controllers.py (73%) rename web_export_view/static/src/js/{web_advanced_export.js => web_export_view.js} (98%) rename web_export_view/static/src/xml/{web_advanced_export.xml => web_export_view_template.xml} (92%) create mode 100644 web_export_view/view/web_export_view.xml diff --git a/web_export_view/__init__.py b/web_export_view/__init__.py index 096919645..950efdaa4 100644 --- a/web_export_view/__init__.py +++ b/web_export_view/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # Copyright (C) 2012 Agile Business Group sagl () # Copyright (C) 2012 Domsense srl () # @@ -18,4 +18,4 @@ # along with this program. If not, see . # ############################################################################## -import controllers +import controllers \ No newline at end of file diff --git a/web_export_view/__openerp__.py b/web_export_view/__openerp__.py index 37ab5ede2..e2c6a6364 100644 --- a/web_export_view/__openerp__.py +++ b/web_export_view/__openerp__.py @@ -1,9 +1,8 @@ # -*- coding: utf-8 -*- -# ############################################################################# +############################################################################## # -# Copyright (C) 2012 Domsense srl () -# Copyright (C) 2012-2013 Agile Business Group sagl -# () +# Copyright (C) 2012 Agile Business Group sagl () +# Copyright (C) 2012 Domsense srl () # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published @@ -22,7 +21,7 @@ { 'name': 'Export Current View', - 'version': '1.1', + 'version': '1.2', 'category': 'Web', 'description': """ WEB EXPORT VIEW @@ -50,11 +49,11 @@ the same data of the tree view you are looking at, headers included. 'depends': [ 'web', ], - 'js': [ - 'static/src/js/web_advanced_export.js', + 'data': [ + 'view/web_export_view.xml', ], 'qweb': [ - 'static/src/xml/web_advanced_export.xml', + 'static/src/xml/web_export_view_template.xml', ], 'installable': True, 'auto_install': False, diff --git a/web_export_view/controllers/__init__.py b/web_export_view/controllers/__init__.py new file mode 100644 index 000000000..994ad3688 --- /dev/null +++ b/web_export_view/controllers/__init__.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# Copyright (C) 2012 Agile Business Group sagl () +# Copyright (C) 2012 Domsense srl () +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published +# by the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## +import controllers diff --git a/web_export_view/controllers.py b/web_export_view/controllers/controllers.py similarity index 73% rename from web_export_view/controllers.py rename to web_export_view/controllers/controllers.py index 82968ffe4..acdcf2a89 100644 --- a/web_export_view/controllers.py +++ b/web_export_view/controllers/controllers.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# ############################################################################# +############################################################################## # # Copyright (C) 2012 Agile Business Group sagl () # Copyright (C) 2012 Domsense srl () @@ -23,33 +23,30 @@ try: except ImportError: import simplejson as json -import openerp import openerp.http as http from openerp.http import request from openerp.addons.web.controllers.main import ExcelExport class ExcelExportView(ExcelExport): - _cp_path = '/web/export/xls_view' - def __getattribute__(self, name): if name == 'fmt': raise AttributeError() return super(ExcelExportView, self).__getattribute__(name) - @http.route('/web/export/xls_view', type='json', auth='user') + @http.route('/web/export/xls_view', type='http', auth='user') def index(self, data, token): data = json.loads(data) model = data.get('model', []) columns_headers = data.get('headers', []) rows = data.get('rows', []) - # - # return req.make_response( - # self.from_data(columns_headers, rows), - # headers=[ - # ('Content-Disposition', 'attachment; filename="%s"' - # % self.filename(model)), - # ('Content-Type', self.content_type) - # ], - # cookies={'fileToken': token} - # ) + + return request.make_response( + self.from_data(columns_headers, rows), + headers=[ + ('Content-Disposition', 'attachment; filename="%s"' + % self.filename(model)), + ('Content-Type', self.content_type) + ], + cookies={'fileToken': token} + ) diff --git a/web_export_view/static/src/js/web_advanced_export.js b/web_export_view/static/src/js/web_export_view.js similarity index 98% rename from web_export_view/static/src/js/web_advanced_export.js rename to web_export_view/static/src/js/web_export_view.js index 4b096b532..74c86d4d7 100644 --- a/web_export_view/static/src/js/web_advanced_export.js +++ b/web_export_view/static/src/js/web_export_view.js @@ -18,7 +18,6 @@ // along with this program. If not, see . // //############################################################################# - openerp.web_export_view = function (instance) { debugger; @@ -94,21 +93,20 @@ openerp.web_export_view = function (instance) { }); export_rows.push(export_row); } - ; } }); $.blockUI(); + debugger; view.session.get_file({ url: '/web/export/xls_view', data: {data: JSON.stringify({ model: view.model, headers: export_columns_names, - rows: export_rows, + rows: export_rows })}, complete: $.unblockUI }); - }, - + } }); }; diff --git a/web_export_view/static/src/xml/web_advanced_export.xml b/web_export_view/static/src/xml/web_export_view_template.xml similarity index 92% rename from web_export_view/static/src/xml/web_advanced_export.xml rename to web_export_view/static/src/xml/web_export_view_template.xml index e5c48f5fe..fbd855d9e 100644 --- a/web_export_view/static/src/xml/web_advanced_export.xml +++ b/web_export_view/static/src/xml/web_export_view_template.xml @@ -1,6 +1,5 @@ - +
diff --git a/web_export_view/view/web_export_view.xml b/web_export_view/view/web_export_view.xml new file mode 100644 index 000000000..502070f13 --- /dev/null +++ b/web_export_view/view/web_export_view.xml @@ -0,0 +1,11 @@ + + + + + + + From dd3a326b3ea1dd1b46c7bfc203f7c1c2dd7e6839 Mon Sep 17 00:00:00 2001 From: Adil Houmadi Date: Sat, 26 Jul 2014 14:44:45 +0200 Subject: [PATCH 3/7] remove debugger instruction --- web_export_view/static/src/js/web_export_view.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/web_export_view/static/src/js/web_export_view.js b/web_export_view/static/src/js/web_export_view.js index 74c86d4d7..2cdfa814a 100644 --- a/web_export_view/static/src/js/web_export_view.js +++ b/web_export_view/static/src/js/web_export_view.js @@ -20,7 +20,6 @@ //############################################################################# openerp.web_export_view = function (instance) { - debugger; var _t = instance.web._t, QWeb = instance.web.qweb; @@ -96,7 +95,6 @@ openerp.web_export_view = function (instance) { } }); $.blockUI(); - debugger; view.session.get_file({ url: '/web/export/xls_view', data: {data: JSON.stringify({ From 434e119c516b7390134624fe2a806b742c870f6d Mon Sep 17 00:00:00 2001 From: Adil Houmadi Date: Sat, 26 Jul 2014 14:57:47 +0200 Subject: [PATCH 4/7] [Fix] ./web_export_view/__init__.py:21:19: W292 no newline at end of file --- web_export_view/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_export_view/__init__.py b/web_export_view/__init__.py index 950efdaa4..994ad3688 100644 --- a/web_export_view/__init__.py +++ b/web_export_view/__init__.py @@ -18,4 +18,4 @@ # along with this program. If not, see . # ############################################################################## -import controllers \ No newline at end of file +import controllers From aa05cfd2bb33bdda6a4cf0e1c40968e798cd82af Mon Sep 17 00:00:00 2001 From: Adil Houmadi Date: Sat, 26 Jul 2014 15:40:17 +0200 Subject: [PATCH 5/7] [FIX] Apply menu only on list view --- web_export_view/static/src/js/web_export_view.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/web_export_view/static/src/js/web_export_view.js b/web_export_view/static/src/js/web_export_view.js index 2cdfa814a..887fee2b7 100644 --- a/web_export_view/static/src/js/web_export_view.js +++ b/web_export_view/static/src/js/web_export_view.js @@ -27,10 +27,12 @@ openerp.web_export_view = function (instance) { redraw: function () { var self = this; this._super.apply(this, arguments); - self.$el.find('.oe_sidebar').append(QWeb.render('AddExportViewMain', {widget: self})); - self.$el.find('.oe_sidebar_export_view_xls').on('click', self.on_sidebar_export_view_xls); + if (self.getParent().ViewManager.active_view == 'list') { + self.$el.find('.oe_sidebar').append(QWeb.render('AddExportViewMain', {widget: self})); + self.$el.find('.oe_sidebar_export_view_xls').on('click', self.on_sidebar_export_view_xls); + } }, - + on_sidebar_export_view_xls: function () { // Select the first list of the current (form) view // or assume the main view is a list view and use that From 291f122d521bfdaea0c442de10b95016084f1457 Mon Sep 17 00:00:00 2001 From: Adil Houmadi Date: Sat, 26 Jul 2014 16:53:36 +0200 Subject: [PATCH 6/7] [FIX] Fix bad indentation https://github.com/OCA/web/pull/27#discussion_r15434034 --- web_export_view/static/src/js/web_export_view.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/web_export_view/static/src/js/web_export_view.js b/web_export_view/static/src/js/web_export_view.js index 887fee2b7..df4419de2 100644 --- a/web_export_view/static/src/js/web_export_view.js +++ b/web_export_view/static/src/js/web_export_view.js @@ -20,8 +20,7 @@ //############################################################################# openerp.web_export_view = function (instance) { - var _t = instance.web._t, - QWeb = instance.web.qweb; + var _t = instance.web._t, QWeb = instance.web.qweb; instance.web.Sidebar.include({ redraw: function () { @@ -32,7 +31,7 @@ openerp.web_export_view = function (instance) { self.$el.find('.oe_sidebar_export_view_xls').on('click', self.on_sidebar_export_view_xls); } }, - + on_sidebar_export_view_xls: function () { // Select the first list of the current (form) view // or assume the main view is a list view and use that From 01872a582b26f63f467db67b48a64549f5dc59eb Mon Sep 17 00:00:00 2001 From: Adil Houmadi Date: Sat, 2 Aug 2014 11:05:20 +0200 Subject: [PATCH 7/7] [FIX] : see => https://github.com/OCA/web/pull/27#discussion-diff-15447231 --- web_export_view/controllers/controllers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_export_view/controllers/controllers.py b/web_export_view/controllers/controllers.py index acdcf2a89..3aa17857c 100644 --- a/web_export_view/controllers/controllers.py +++ b/web_export_view/controllers/controllers.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- ############################################################################## # -# Copyright (C) 2012 Agile Business Group sagl () # Copyright (C) 2012 Domsense srl () +# Copyright (C) 2012-2013 Agile Business Group sagl () # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published