Merge lp:~ovnicraft/web-addons/6.1-web_report_name into lp:~webaddons-core-editors/web-addons/6.1

[Cristian Salamea]

Add module to change report file name, now system gives report.service.name i consider not user friendly and redefine index method to return Action Human-readable Name.pdf defined in report.

So i want help to test.

Regards,

[lp:~ovnicraft/web-addons/6.1-web_report_name]

14. By Cristian Salamea on 2013-06-15

[IMP] function to define filename

15. By Cristian Salamea on 2013-06-16

[FIX] new cp_path report and filename function

[Holger Brunn (Therp) (hbrunn)]

index is mainly a copy of Reports' index. Is there a reason why you don't call super(...).index here and apply your changes in its return value?

Further: Why don't you hijack the original's _cp_path, as this would make the js-part unnecessary?

review: Needs Information

[Cristian Salamea (ovnicraft)]

Hi Holger,

I describe what i did:

Try 1. First redefine index module calling super w/o hijacking cp_path and w/o JS code, it does not works.
Try 2. redefine index module w/o JS code, hijack cp_path, does not work, obviously error.
Try 3. Code pushed here.

First code and error: https://gist.github.com/ovnicraft/5794893
I dont understand the error with args, i 'think' could be about decorator and try (stupid try) dont pass token and get this: https://gist.github.com/ovnicraft/5794916

The main problem what i found is index redefinition call does not works.

If you can guide to improve the code and get the goal will thank you.

Regards !

[Holger Brunn (Therp) (hbrunn)]

That's indeed tricky as we don't want to call the decorated version.
super(FileNameReports, self).index.__closure__[0].cell_contents(self, req, action, token)
should do it.

[Cristian Salamea (ovnicraft)]

I will give a try your call and see what happen, however i consider is not a very clear redefinition dont call the decorated version.

Thats why i choose redefine completely index method and hijack the cp_path.

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

This article may interest you: http://apiguy.github.io/blog/2013/06/03/the-dark-side-of-decorators/

[Cristian Salamea (ovnicraft)]

I consider a dirty hack what i do, hope found a clearest way to do it.

Regards,

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Reading the discussions on this MP I feels that's still work in progress?
Is it true? If yes, can you change the state of the MP to the 'Work in progress' state please?

Unmerged revisions

15. By Cristian Salamea on 2013-06-16

[FIX] new cp_path report and filename function

14. By Cristian Salamea on 2013-06-15

[IMP] function to define filename

13. By Cristian Salamea on 2013-06-15

[IMP] module to add action name to file report instead report.service.name

=== added directory 'web_report_name'
=== added file 'web_report_name/__init__.py'
--- web_report_name/__init__.py	1970-01-01 00:00:00 +0000
+++ web_report_name/__init__.py	2013-06-16 03:45:31 +0000
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2013 Gnuthink Software Ci. Ltd. (<http://www.gnuthink.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

=== added file 'web_report_name/__openerp__.py'
--- web_report_name/__openerp__.py	1970-01-01 00:00:00 +0000
+++ web_report_name/__openerp__.py	2013-06-16 03:45:31 +0000
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2013 Gnuthink Software Ci. Ltd. (<http://www.gnuthink.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/>.
+#
+##############################################################################
+
+{
+    'name': 'Report Name',
+    'version': '1.0',
+    'category': 'Web',
+    'description': """
+WEB REPORT NAME
+===============
+
+All reports are exported with my.model.name.pdf
+We prefer call it Name Readable Report.pdf
+""",
+    'author': 'Gnuthink Software Co. Ltd.',
+    'website': 'http://www.gnuthink.com',
+    'license': 'AGPL-3',
+    'depends': ['web'],
+    'data': [],
+    'js': ['static/src/js/views.js'],
+    'active': False,
+    'auto_install': False,
+}
+

=== added file 'web_report_name/controllers.py'
--- web_report_name/controllers.py	1970-01-01 00:00:00 +0000
+++ web_report_name/controllers.py	2013-06-16 03:45:31 +0000
@@ -0,0 +1,61 @@
+import base64
+import time
+import simplejson
+
+from web import common
+import web.common.http as openerpweb
+from web.controllers.main import Reports
+
+class FileNameReports(Reports):
+
+    _cp_path = "/web/fn_report"
+    
+    def get_filename_report(self, action, report_struct):
+        filename = '%s %s.%s' %(action['name'], time.strftime('%Y-%m-%d %H%M%S'), report_struct['format'])
+        return filename
+
+    @openerpweb.httprequest
+    def index(self, req, action, token):
+        action = simplejson.loads(action)
+
+        report_srv = req.session.proxy("report")
+        context = req.session.eval_context(
+            common.nonliterals.CompoundContext(
+                req.context or {}, action[ "context"]))
+
+        report_data = {}
+        report_ids = context["active_ids"]
+        if 'report_type' in action:
+            report_data['report_type'] = action['report_type']
+        if 'datas' in action:
+            if 'ids' in action['datas']:
+                report_ids = action['datas'].pop('ids')
+            report_data.update(action['datas'])
+
+        report_id = report_srv.report(
+            req.session._db, req.session._uid, req.session._password,
+            action["report_name"], report_ids,
+            report_data, context)
+
+        report_struct = None
+        while True:
+            report_struct = report_srv.report_get(
+                req.session._db, req.session._uid, req.session._password, report_id)
+            if report_struct["state"]:
+                break
+
+            time.sleep(self.POLLING_DELAY)
+
+        report = base64.b64decode(report_struct['result'])
+        if report_struct.get('code') == 'zlib':
+            report = zlib.decompress(report)
+        report_mimetype = self.TYPES_MAPPING.get(
+            report_struct['format'], 'octet-stream')
+        return req.make_response(report,
+             headers=[
+                 ('Content-Disposition', 'attachment; filename="%s"' % self.get_filename_report(action, report_struct)),
+                 ('Content-Type', report_mimetype),
+                 ('Content-Length', len(report))],
+             cookies={'fileToken': int(token)})    
+
+

=== added directory 'web_report_name/static'
=== added directory 'web_report_name/static/src'
=== added directory 'web_report_name/static/src/js'
=== added file 'web_report_name/static/src/js/views.js'
--- web_report_name/static/src/js/views.js	1970-01-01 00:00:00 +0000
+++ web_report_name/static/src/js/views.js	2013-06-16 03:45:31 +0000
@@ -0,0 +1,28 @@
+openerp.web_report_name = function(session) {
+
+    session.web.ActionManager = session.web.ActionManager.extend({
+        ir_actions_report_xml: function(action, on_closed) {
+            var self = this;
+            $.blockUI();
+            self.rpc("/web/session/eval_domain_and_context", {
+                contexts: [action.context],
+                domains: []
+            }).then(function(res) {
+                action = _.clone(action);
+                action.context = res.context;
+                self.session.get_file({
+                    url: '/web/fn_report',
+                    data: {action: JSON.stringify(action)},
+                    complete: $.unblockUI,
+                    success: function(){
+                        if (!self.dialog && on_closed) {
+                            on_closed();
+                        }
+                        self.dialog_stop();
+                    },
+                    error: session.webclient.crashmanager.on_rpc_error
+                })
+            });
+        }    
+    });
+}