diff options
| author | Aaron Bohy <aab@odoo.com> | 2017-11-28 14:23:05 +0100 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2018-01-16 20:49:19 +0100 |
| commit | 80db9f232b883b7a2355b3d9991d603811bd0fe2 (patch) | |
| tree | 71514253f3b54176115f6670f0ae0166a33b7a57 | |
| parent | 32b8cec5361174c92c45a4975d4e02f1fb448aa2 (diff) | |
[MOV] web: move and rename qwebactionmanager.js
| -rw-r--r-- | addons/web/controllers/main.py | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/chrome/action_manager_report.js (renamed from addons/web/static/src/js/report/qwebactionmanager.js) | 9 | ||||
| -rw-r--r-- | addons/web/views/webclient_templates.xml | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index b0cf820005b..8d08f475c74 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1641,7 +1641,7 @@ class ReportController(http.Controller): @http.route(['/report/download'], type='http', auth="user") def report_download(self, data, token): - """This function is used by 'qwebactionmanager.js' in order to trigger the download of + """This function is used by 'action_manager_report.js' in order to trigger the download of a pdf/controller report. :param data: a javascript array JSON.stringified containg report internal url ([0]) and diff --git a/addons/web/static/src/js/report/qwebactionmanager.js b/addons/web/static/src/js/chrome/action_manager_report.js index cc875882ce2..b702ab3a5f9 100644 --- a/addons/web/static/src/js/report/qwebactionmanager.js +++ b/addons/web/static/src/js/chrome/action_manager_report.js @@ -1,5 +1,10 @@ -odoo.define('report.report', function (require) { -'use strict'; +odoo.define('web.ReportActionManager', function (require) { +"use strict"; + +/** + * The purpose of this file is to add the support of Odoo actions of type + * 'ir.actions.report' to the ActionManager. + */ var ActionManager = require('web.ActionManager'); var core = require('web.core'); diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml index 295aa7f9b26..b69450ae752 100644 --- a/addons/web/views/webclient_templates.xml +++ b/addons/web/views/webclient_templates.xml @@ -150,6 +150,7 @@ <script type="text/javascript" src="/web/static/src/js/core/pyeval.js"></script> <script type="text/javascript" src="/web/static/src/js/chrome/action_manager.js"></script> <script type="text/javascript" src="/web/static/src/js/chrome/action_manager_act_window.js"></script> + <script type="text/javascript" src="/web/static/src/js/chrome/action_manager_report.js"/> <script type="text/javascript" src="/web/static/src/js/chrome/control_panel.js"></script> <script type="text/javascript" src="/web/static/src/js/chrome/abstract_web_client.js"></script> <script type="text/javascript" src="/web/static/src/js/chrome/web_client.js"></script> @@ -235,7 +236,6 @@ <script type="text/javascript" src="/web/static/src/js/views/calendar/calendar_renderer.js"></script> <script type="text/javascript" src="/web/static/src/js/views/calendar/calendar_view.js"></script> - <script type="text/javascript" src="/web/static/src/js/report/qwebactionmanager.js"/> <script type="text/javascript" src="/web/static/src/js/report/utils.js"/> <script type="text/javascript" src="/web/static/src/js/report/client_action.js"/> <link rel="stylesheet" type="text/less" href="/web/static/src/less/report_backend.less"/> |