Skip to content

Commit

Permalink
cms_status_message: apply pre-commit
Browse files Browse the repository at this point in the history
  • Loading branch information
@simahawk
simahawk committed Apr 19, 2020
1 parent ee2f216 commit 4af30cf
Show file tree
Hide file tree
Showing 8 changed files with 146 additions and 145 deletions.
6 changes: 2 additions & 4 deletions cms_status_message/controllers/main.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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)
10 changes: 3 additions & 7 deletions cms_status_message/models/website.py
View file
Original file line number Diff line number Diff line change
@@ -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


Expand Down Expand Up @@ -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

Expand Down
39 changes: 21 additions & 18 deletions cms_status_message/static/src/js/autodismiss.js
View file
Original file line number Diff line number Diff line change
@@ -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);
});
},
});
});
78 changes: 38 additions & 40 deletions cms_status_message/static/src/js/tool.js
View file
Original file line number Diff line number Diff line change
@@ -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);
Expand All @@ -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;

});
26 changes: 16 additions & 10 deletions cms_status_message/templates/assets.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,20 @@ Copyright 2017-2018 Camptocamp - Simone Orsi
License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
-->
<odoo>

<template id="assets_frontend" name="CMS status message frontend assets" inherit_id="website.assets_frontend">

<xpath expr="." position="inside">
<script type="text/javascript" src="/cms_status_message/static/src/js/autodismiss.js"></script>
<script type="text/javascript" src="/cms_status_message/static/src/js/tool.js"></script>
</xpath>

</template>

<template
id="assets_frontend"
name="CMS status message frontend assets"
inherit_id="website.assets_frontend"
>
<xpath expr="." position="inside">
<script
type="text/javascript"
src="/cms_status_message/static/src/js/autodismiss.js"
/>
<script
type="text/javascript"
src="/cms_status_message/static/src/js/tool.js"
/>
</xpath>
</template>
</odoo>
35 changes: 16 additions & 19 deletions cms_status_message/templates/display_test.xml
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,19 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>

<template id="display_test" name="CMS status message display test">

<t t-call="website.layout">
<div class="container mt64 text-center">
<h1>Status message display test</h1>
<form class="form" method="GET">
<p>Enter a message and submit the form. <br />You'll see your message rendered as a status message.</p>
<div>
<label for="message">Message</label>
<input type="text" id="message" name="message"/>
</div>
<button type="submit">Test</button>
</form>
</div>
</t>

</template>

<template id="display_test" name="CMS status message display test">
<t t-call="website.layout">
<div class="container mt64 text-center">
<h1>Status message display test</h1>
<form class="form" method="GET">
<p>Enter a message and submit the form. <br
/>You'll see your message rendered as a status message.</p>
<div>
<label for="message">Message</label>
<input type="text" id="message" name="message" />
</div>
<button type="submit">Test</button>
</form>
</div>
</t>
</template>
</odoo>
78 changes: 43 additions & 35 deletions cms_status_message/templates/status_message.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,51 +4,59 @@ Copyright 2017-2018 Camptocamp - Simone Orsi
License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
-->
<odoo>

<template id="status_message" name="CMS status_message">
<t t-set="status_message" t-value="website.get_status_message()" />
<t t-if="status_message">
<t t-call="cms_status_message.message_listing_wrapper" />
<t t-call="cms_status_message.message_listing_wrapper" />
</t>
</template>

<template id="message_listing_wrapper" name="CMS status_message listing wrapper">
<div class="container-fluid status_message">
<t t-foreach="status_message" t-as="msg">
<div t-attf-class="alert alert-#{msg['type']} #{msg['dismissible'] and 'alert-dismissible' or ''}"
t-att-data-autodismiss="msg.get('dismiss_options', {}).get('autodismiss')"
t-att-data-autodismiss-timeout="msg.get('dismiss_options', {}).get('autodismissTimeout')"
role="alert">
<t t-if="msg['dismissible']">
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span t-translation="off" aria-hidden="true" class="fa fa-remove"></span>
</button>
<div class="container-fluid status_message">
<t t-foreach="status_message" t-as="msg">
<div
t-attf-class="alert alert-#{msg['type']} #{msg['dismissible'] and 'alert-dismissible' or ''}"
t-att-data-autodismiss="msg.get('dismiss_options', {}).get('autodismiss')"
t-att-data-autodismiss-timeout="msg.get('dismiss_options', {}).get('autodismissTimeout')"
role="alert"
>
<t t-if="msg['dismissible']">
<button
type="button"
class="close"
data-dismiss="alert"
aria-label="Close"
>
<span
t-translation="off"
aria-hidden="true"
class="fa fa-remove"
/>
</button>
</t>
<t t-call="cms_status_message.message_wrapper" />
</div>
</t>
<t t-call="cms_status_message.message_wrapper" />
</div>
</t>
</div>
</div>
</template>

<template id="message_wrapper" name="CMS status_message single message wrapper">
<div class="msg-wrapper row">
<t t-if="msg['title']">
<div class="title col-md-3">
<strong t-esc="msg['title']" />
</div>
</t>
<div t-attf-class="msg #{msg['title'] and 'col-md-9' or 'col-md-12'}">
<t t-raw="msg['msg']" />
<div class="msg-wrapper row">
<t t-if="msg['title']">
<div class="title col-md-3">
<strong t-esc="msg['title']" />
</div>
</t>
<div t-attf-class="msg #{msg['title'] and 'col-md-9' or 'col-md-12'}">
<t t-raw="msg['msg']" />
</div>
</div>
</div>
</template>

<template id="add_status_message" inherit_id="website.layout" name="Add status message">

<xpath expr="//div[@id='wrapwrap']/main/*" position="before">
<t t-call="cms_status_message.status_message" />
</xpath>

<template
id="add_status_message"
inherit_id="website.layout"
name="Add status message"
>
<xpath expr="//div[@id='wrapwrap']/main/*" position="before">
<t t-call="cms_status_message.status_message" />
</xpath>
</template>

</odoo>
Loading

0 comments on commit 4af30cf

Please sign in to comment.