From 4af30cfa4abcbf14f2d1d6ddfd5c2357eb187e16 Mon Sep 17 00:00:00 2001 From: Simone Orsi Date: Sun, 19 Apr 2020 16:36:45 +0200 Subject: [PATCH] cms_status_message: apply pre-commit --- cms_status_message/controllers/main.py | 6 +- cms_status_message/models/website.py | 10 +-- .../static/src/js/autodismiss.js | 39 +++++----- cms_status_message/static/src/js/tool.js | 78 +++++++++---------- cms_status_message/templates/assets.xml | 26 ++++--- cms_status_message/templates/display_test.xml | 35 ++++----- .../templates/status_message.xml | 78 ++++++++++--------- cms_status_message/tests/test_message.py | 19 ++--- 8 files changed, 146 insertions(+), 145 deletions(-) diff --git a/cms_status_message/controllers/main.py b/cms_status_message/controllers/main.py index 38635374..e61028c4 100644 --- a/cms_status_message/controllers/main.py +++ b/cms_status_message/controllers/main.py @@ -10,7 +10,7 @@ class CMSStatusMsgTest(http.Controller): display_test_template = "cms_status_message.display_test" @http.route( - ["/cms/status-message/display-test",], + "/cms/status-message/display-test", type="http", auth="public", website=True, @@ -21,7 +21,5 @@ def display_test(self, **kw): # pragma: no cover msg = http.request.httprequest.args.get("message", "yes it works") msg_title = "Title" for type_ in ("success", "warning", "danger", "info"): - http.request.website.add_status_message( - msg, type_=type_, title=msg_title - ) + http.request.website.add_status_message(msg, type_=type_, title=msg_title) return http.request.render(self.display_test_template) diff --git a/cms_status_message/models/website.py b/cms_status_message/models/website.py index cbde38e2..dae2ea8e 100644 --- a/cms_status_message/models/website.py +++ b/cms_status_message/models/website.py @@ -1,7 +1,7 @@ # Copyright 2017-2018 Camptocamp - Simone Orsi # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -from odoo import models, api, _ +from odoo import _, api, models from odoo.http import request @@ -80,14 +80,10 @@ def _get_autodismiss_config(self): else: # default ON autodismiss = True - timeout = ( - params.get_param("cms_status_message.autodismiss_timeout") or "" - ) + timeout = params.get_param("cms_status_message.autodismiss_timeout") or "" config = { "autodismiss": autodismiss, - "autodismissTimeout": int(timeout.strip()) - if timeout.strip() - else 8000, + "autodismissTimeout": int(timeout.strip()) if timeout.strip() else 8000, } return config diff --git a/cms_status_message/static/src/js/autodismiss.js b/cms_status_message/static/src/js/autodismiss.js index d9310076..ac6a674b 100644 --- a/cms_status_message/static/src/js/autodismiss.js +++ b/cms_status_message/static/src/js/autodismiss.js @@ -1,21 +1,24 @@ -odoo.define('cms_status_message.autodismiss', function (require) { - 'use strict'; +odoo.define("cms_status_message.autodismiss", function(require) { + "use strict"; - var sAnimation = require('website.content.snippets.animation'); - - sAnimation.registry.CMSStatusMessageAutoDismiss = sAnimation.Class.extend({ - selector: ".status_message [data-autodismiss]", - start: function () { - this.dimissTimeout = this.$el.data('autodismissTimeout') || 8000; - this.handle_autodimiss(); - }, - handle_autodimiss: function () { - this.$el.fadeOut(this.dimissTimeout, function() { - this.$el.remove(); - }).on("mouseover", function(e) { - $(this).stop(true /*, false implied */ ).fadeIn(0); - }); - } - }); + var sAnimation = require("website.content.snippets.animation"); + sAnimation.registry.CMSStatusMessageAutoDismiss = sAnimation.Class.extend({ + selector: ".status_message [data-autodismiss]", + start: function() { + this.dimissTimeout = this.$el.data("autodismissTimeout") || 8000; + this.handle_autodimiss(); + }, + handle_autodimiss: function() { + this.$el + .fadeOut(this.dimissTimeout, function() { + this.$el.remove(); + }) + .on("mouseover", function() { + $(this) + .stop(true) + .fadeIn(0); + }); + }, + }); }); diff --git a/cms_status_message/static/src/js/tool.js b/cms_status_message/static/src/js/tool.js index 4652d931..0f229a23 100644 --- a/cms_status_message/static/src/js/tool.js +++ b/cms_status_message/static/src/js/tool.js @@ -1,26 +1,26 @@ -odoo.define('cms_status_message.tool', function (require) { - 'use strict'; +odoo.define("cms_status_message.tool", function(require) { + "use strict"; - var core = require('web.core'), - ajax = require('web.ajax'); + var core = require("web.core"), + ajax = require("web.ajax"); var qweb = core.qweb; var load_templates = function load_templates(names) { - // load existing qweb templates + // Load existing qweb templates var wait_for = []; - $.each(names, function(){ + $.each(names, function() { var def = $.Deferred(); if (this in qweb.templates) { - // already loaded + // Already loaded def.resolve(); } else { - ajax.jsonRpc('/web/dataset/call', 'call', { - 'model': 'ir.ui.view', - 'method': 'read_template', - 'args': [this] - }).done(function (data) { + ajax.jsonRpc("/web/dataset/call", "call", { + model: "ir.ui.view", + method: "read_template", + args: [this], + }).done(function(data) { qweb.add_template(data); - def.resolve() + def.resolve(); }); } wait_for.push(def); @@ -29,49 +29,47 @@ odoo.define('cms_status_message.tool', function (require) { }; var MessageTool = { - add_message: function add_message (msg, options) { - return ajax.jsonRpc('/web/dataset/call', 'call', { - 'model': 'website', - 'method': 'add_status_message', - 'args': [[msg, ], options] - }); + add_message: function add_message(msg, options) { + return ajax.jsonRpc("/web/dataset/call", "call", { + model: "website", + method: "add_status_message", + args: [[msg], options], + }); }, get_messages: function get_messages() { - return ajax.jsonRpc('/web/dataset/call', 'call', { - 'model': 'website', - 'method': 'get_status_message', - 'args': [] + return ajax.jsonRpc("/web/dataset/call", "call", { + model: "website", + method: "get_status_message", + args: [], }); }, render_messages: function render_messages(msg, selector) { var def = $.Deferred(); load_templates([ - 'cms_status_message.message_listing_wrapper', - 'cms_status_message.message_wrapper', - ]).done(function () { - // defaults + "cms_status_message.message_listing_wrapper", + "cms_status_message.message_wrapper", + ]).done(function() { + // Defaults var status_message = { - 'msg': '', - 'title': null, - 'type': 'info', - 'dismissible': true + msg: "", + title: null, + type: "info", + dismissible: true, }; - // inject user values + // Inject user values $.extend(status_message, msg); - // render it - var result = qweb.render( - 'cms_status_message.message_listing_wrapper', - {status_message: [status_message]} - ); - if(selector){ + // Render it + var result = qweb.render("cms_status_message.message_listing_wrapper", { + status_message: [status_message], + }); + if (selector) { $(result).prependTo(selector); } def.resolve(result); }); return def; - } + }, }; return MessageTool; - }); diff --git a/cms_status_message/templates/assets.xml b/cms_status_message/templates/assets.xml index b508bca8..d7c35f05 100644 --- a/cms_status_message/templates/assets.xml +++ b/cms_status_message/templates/assets.xml @@ -4,14 +4,20 @@ Copyright 2017-2018 Camptocamp - Simone Orsi License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). --> - - - +