Merge pull request #27 from taktik/8.0-web_export_view

[IMP] easy_web_export : migration to 8.0

__unported__/web_export_view/__init__.py → web_export_view/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
 #    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
 #

__unported__/web_export_view/__openerp__.py → web_export_view/__openerp__.py

@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
 #    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
-#    Copyright (C) 2012-2013 Agile Business Group sagl
-#    (<http://www.agilebg.com>)
 #
 #    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
@@ -47,13 +46,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',
+    ],
+    'data': [
+        'view/web_export_view.xml',
+    ],
+    'qweb': [
+        'static/src/xml/web_export_view_template.xml',
+    ],
+    'installable': True,
     'auto_install': False,
-    'web_preload': False,
 }

web_export_view/controllers/__init__.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import controllers

__unported__/web_export_view/controllers.py → web_export_view/controllers/controllers.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
 #    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    Copyright (C) 2012-2013 Agile Business Group sagl (<http://www.agilebg.com>)
 #
 #    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
@@ -23,31 +23,29 @@ try:
 except ImportError:
     import simplejson as json
 
-import web.http as openerpweb
-
-from web.controllers.main import ExcelExport
+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)
 
-    @openerpweb.httprequest
-    def index(self, req, data, token):
+    @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(
+        return request.make_response(
             self.from_data(columns_headers, rows),
             headers=[
                 ('Content-Disposition', 'attachment; filename="%s"'
-                    % self.filename(model)),
+                 % self.filename(model)),
                 ('Content-Type', self.content_type)
             ],
             cookies={'fileToken': token}

__unported__/web_export_view/static/js/web_advanced_export.js → web_export_view/static/src/js/web_export_view.js

@@ -18,28 +18,28 @@
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 //#############################################################################
+openerp.web_export_view = function (instance) {
 
-openerp.web_export_view = function(instance, m) {
-
-    var _t = instance.web._t,
-    QWeb = instance.web.qweb;
+    var _t = instance.web._t, 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);
+            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() {
+        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 +53,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,51 +62,50 @@ 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 = $( '<div>' + cell.innerHTML + '</div>');
-                                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 = $('<div>' + cell.innerHTML + '</div>');
+                                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
             });
-        },
-
+        }
     });
 
 };

__unported__/web_export_view/static/xml/web_advanced_export.xml → web_export_view/static/src/xml/web_export_view_template.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- vim:fdl=1:
--->
+
 <templates id="template" xml:space="preserve">
 <t t-name="AddExportViewMain">
     <div class="oe_form_dropdown_section">
@@ -10,4 +9,4 @@
         </ul>
     </div>
 </t>
-</templates>
+</templates>

web_export_view/view/web_export_view.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<openerp>
+    <data>
+        <template id="assets_backend" name="web_export_view assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <script type="text/javascript" src="/web_export_view/static/src/js/web_export_view.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>