From f8357a1a605d1c74d09d7ea5d74ab53ce77aa085 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Thu, 13 Aug 2015 13:19:30 +0200 Subject: [PATCH] [FIX] report: update data with options for backward compatibility; Remove empty website_report module. --- addons/report/controllers/main.py | 2 +- addons/website_report/controllers/main.py | 16 ---------------- addons/website_report/report.py | 15 --------------- 3 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 addons/website_report/controllers/main.py delete mode 100644 addons/website_report/report.py diff --git a/addons/report/controllers/main.py b/addons/report/controllers/main.py index 7f72097b68d..db1747e66ab 100644 --- a/addons/report/controllers/main.py +++ b/addons/report/controllers/main.py @@ -29,7 +29,7 @@ class ReportController(Controller): if docids: docids = [int(i) for i in docids.split(',')] if data.get('options'): - data['options'] = simplejson.loads(data['options']) + data.update(simplejson.loads(data.pop('options'))) if data.get('context'): # Ignore 'lang' here, because the context in data is the one from the webclient *but* if # the user explicitely wants to change the lang, this mechanism overwrites it. diff --git a/addons/website_report/controllers/main.py b/addons/website_report/controllers/main.py deleted file mode 100644 index 5d594521d2d..00000000000 --- a/addons/website_report/controllers/main.py +++ /dev/null @@ -1,16 +0,0 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. - -from openerp.addons.website.controllers.main import Website -from openerp.http import request, route - - -class Website(Website): - - @route() - def customize_template_get(self, key, full=False, bundles=False): - res = super(Website, self).customize_template_get(key, full=full, bundles=bundles) - if full: - for r in request.session.get('report_view_ids', []): - res += super(Website, self).customize_template_get(r.get('xml_id'), full=full) - return res diff --git a/addons/website_report/report.py b/addons/website_report/report.py deleted file mode 100644 index d84263980f6..00000000000 --- a/addons/website_report/report.py +++ /dev/null @@ -1,15 +0,0 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. - -from openerp.addons.web.http import request -from openerp.osv import osv - - -class Report(osv.Model): - _inherit = 'report' - - def render(self, cr, uid, ids, template, values=None, context=None): - if request and hasattr(request, 'website'): - if request.website is not None: - request.session['report_view_ids'] = [] - return super(Report, self).render(cr, uid, ids, template, values=values, context=context)