3
0
Fork 0

[IMP] web_group_expand: black, isort

14.0
Manuel Calero 2021-03-17 13:04:56 +01:00 committed by BT-aestebanez
parent 945924ee7e
commit f25f837d61
4 changed files with 71 additions and 47 deletions

View File

@ -8,13 +8,7 @@
"Serv. Tecnol. Avanzados - Pedro M. Baeza, "
"Therp BV, "
"Odoo Community Association (OCA)",
"depends": [
"web",
],
"qweb": [
"static/src/xml/expand_buttons.xml",
],
"data": [
"views/templates.xml",
],
"depends": ["web",],
"qweb": ["static/src/xml/expand_buttons.xml",],
"data": ["views/templates.xml",],
}

View File

@ -6,12 +6,12 @@ odoo.define("web.web_group_expand", function(require) {
require("web.ListController").include({
start: function() {
this.$expandGroupButtons = $(qweb.render("web_group_expand.Buttons"));
this.$expandGroupButtons.find("#oe_group_by_expand").on(
"click", this.expandAllGroups.bind(this)
);
this.$expandGroupButtons.find("#oe_group_by_collapse").on(
"click", this.collapseAllGroups.bind(this)
);
this.$expandGroupButtons
.find("#oe_group_by_expand")
.on("click", this.expandAllGroups.bind(this));
this.$expandGroupButtons
.find("#oe_group_by_collapse")
.on("click", this.collapseAllGroups.bind(this));
return this._super.apply(this, arguments);
},
@ -26,25 +26,39 @@ odoo.define("web.web_group_expand", function(require) {
// layer that's not already fully expanded.
var layer = this.renderer.state.data;
while (layer.length) {
var closed = layer.filter(function (group) {return !group.isOpen;});
var closed = layer.filter(function(group) {
return !group.isOpen;
});
if (closed.length) {
// This layer is not completely expanded, expand it
this._toggleGroups(closed);
break;
}
// This layer is completely expanded, move to the next
layer = _.flatten(layer.map(function (group) {return group.data;}), true);
layer = _.flatten(
layer.map(function(group) {
return group.data;
}),
true
);
}
},
collapseAllGroups: function() {
// We collapse layer by layer. So first we need to find the deepest
// layer that's not already fully collapsed.
var layer = this.renderer.state.data
.filter(function (group) {return group.isOpen;});
var layer = this.renderer.state.data.filter(function(group) {
return group.isOpen;
});
while (layer.length) {
var next = _.flatten(layer.map(function (group) {return group.data;}), true)
.filter(function (group) {return group.isOpen;});
var next = _.flatten(
layer.map(function(group) {
return group.data;
}),
true
).filter(function(group) {
return group.isOpen;
});
if (!next.length) {
// Next layer is fully collapsed, so collapse this one
this._toggleGroups(layer);
@ -59,14 +73,19 @@ odoo.define("web.web_group_expand", function(require) {
var defs = groups.map(function(group) {
return self.model.toggleGroup(group.id);
});
$.when(...defs).then(this.update.bind(this, {}, {keepSelection: true, reload: false}));
}
$.when(...defs).then(
this.update.bind(this, {}, {keepSelection: true, reload: false})
);
},
});
require("web.ListRenderer").include({
updateState: function() {
var res = this._super.apply(this, arguments);
$("nav.oe_group_by_expand_buttons").toggleClass("o_hidden", !this.isGrouped);
$("nav.oe_group_by_expand_buttons").toggleClass(
"o_hidden",
!this.isGrouped
);
return res;
},
});

View File

@ -2,14 +2,18 @@
<templates>
<t t-name="web_group_expand.Buttons">
<nav class="btn-group oe_group_by_expand_buttons o_hidden">
<button class="btn btn-secondary fa fa-expand"
<button
class="btn btn-secondary fa fa-expand"
id="oe_group_by_expand"
title="Expand groups"
type="button" />
<button class="btn btn-secondary fa fa-compress"
type="button"
/>
<button
class="btn btn-secondary fa fa-compress"
id="oe_group_by_collapse"
title="Collapse groups"
type="button" />
type="button"
/>
</nav>
</t>
</templates>

View File

@ -1,8 +1,15 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<template id="assets_backend" name="web_groupby_expand assets" inherit_id="web.assets_backend">
<template
id="assets_backend"
name="web_groupby_expand assets"
inherit_id="web.assets_backend"
>
<xpath expr="." position="inside">
<script type="text/javascript" src="/web_group_expand/static/src/js/web_group_expand.js"></script>
<script
type="text/javascript"
src="/web_group_expand/static/src/js/web_group_expand.js"
/>
</xpath>
</template>
</odoo>