3
0
Fork 0

[IMP] web_widget_child_selector: black, isort, prettier

15.0-ocabot-merge-pr-2789-by-pedrobaeza-bump-patch
Enric Tobella 2021-06-21 16:29:52 +02:00 committed by Olga Marco
parent bed16c9842
commit 361db88329
7 changed files with 132 additions and 97 deletions

View File

@ -2,19 +2,13 @@
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
{
'name': 'Web Widget Child Selector',
'summary': "Widget used for navigation on hierarchy fields",
'version': '12.0.1.0.0',
'license': 'AGPL-3',
'author': 'Creu Blanca,Odoo Community Association (OCA)',
'website': 'https://github.com/OCA/web',
'depends': [
'web',
],
'data': [
'views/assets.xml',
],
'qweb': [
'static/src/xml/widget_child_selector.xml',
],
"name": "Web Widget Child Selector",
"summary": "Widget used for navigation on hierarchy fields",
"version": "12.0.1.0.0",
"license": "AGPL-3",
"author": "Creu Blanca,Odoo Community Association (OCA)",
"website": "https://github.com/OCA/web",
"depends": ["web",],
"data": ["views/assets.xml",],
"qweb": ["static/src/xml/widget_child_selector.xml",],
}

View File

@ -5,27 +5,28 @@ from odoo import models
class Base(models.AbstractModel):
_inherit = 'base'
_inherit = "base"
def _get_record_parents(self, field):
if not self or not hasattr(self, self._parent_name):
return []
return getattr(
self, self._parent_name
)._get_record_parents(field) + [(self.id, str(getattr(self, field)))]
return getattr(self, self._parent_name)._get_record_parents(field) + [
(self.id, str(getattr(self, field)))
]
def _get_record_direct_childs(self, field, domain):
if not hasattr(self, self._parent_name):
return []
return [(r.id, str(getattr(r, field))) for r in self.search([(
self._parent_name, '=', self.id or False
)] + domain)]
return [
(r.id, str(getattr(r, field)))
for r in self.search([(self._parent_name, "=", self.id or False)] + domain)
]
def get_record_direct_childs_parents(self, options, domain=False):
if not domain:
domain = []
field = options.get('child_selection_field', 'display_name')
field = options.get("child_selection_field", "display_name")
return {
'childs': self._get_record_direct_childs(field, domain),
'parents': self._get_record_parents(field)
"childs": self._get_record_direct_childs(field, domain),
"parents": self._get_record_parents(field),
}

View File

@ -1,28 +1,37 @@
odoo.define('web.web_widget_child_selector', function(require) {
odoo.define("web.web_widget_child_selector", function(require) {
"use strict";
var relational_fields = require('web.relational_fields');
var field_registry = require('web.field_registry');
var core = require('web.core');
var relational_fields = require("web.relational_fields");
var field_registry = require("web.field_registry");
var core = require("web.core");
var qweb = core.qweb;
var FieldMany2One = relational_fields.FieldMany2One;
var FieldChildSelector = FieldMany2One.extend({
template: "FieldChildSelector",
events: _.extend({}, FieldMany2One.prototype.events, {
'click .o_child_selection_button': '_onChildSelectionClick',
"click .o_child_selection_button": "_onChildSelectionClick",
}),
start: function () {
this.$input_dropdown = this.$('.o_input_dropdown');
this.$input_value = this.$('.o_input_value')
start: function() {
this.$input_dropdown = this.$(".o_input_dropdown");
this.$input_value = this.$(".o_input_value");
return this._super.apply(this, arguments);
},
_renderReadonly: function () {
var value = _.escape((this.m2o_value || "").trim()).split("\n").join("<br/>");
_renderReadonly: function() {
var value = _.escape((this.m2o_value || "").trim())
.split("\n")
.join("<br/>");
this.$el.html(value);
if (!this.nodeOptions.no_open && this.value) {
this.$el.attr('href', _.str.sprintf('#id=%s&model=%s', this.value.res_id, this.field.relation));
this.$el.addClass('o_form_uri');
this.$el.attr(
"href",
_.str.sprintf(
"#id=%s&model=%s",
this.value.res_id,
this.field.relation
)
);
this.$el.addClass("o_form_uri");
}
},
_set_childs: function() {
@ -32,42 +41,43 @@ odoo.define('web.web_widget_child_selector', function(require) {
this.$input_dropdown.empty();
this.$input_value.empty();
var resources = [];
if (this.value.res_id)
resources = [this.value.res_id]
if (this.value.res_id) resources = [this.value.res_id];
this._rpc({
model: this.field.relation,
method: 'get_record_direct_childs_parents',
method: "get_record_direct_childs_parents",
args: [
resources,
this.nodeOptions,
this.record.getDomain({fieldName: this.name}),
],
context: this.record.getContext(this.recordParams),
})
.then(function (data) {
_.each(data['parents'], function(parent, key) {
}).then(function(data) {
_.each(data.parents, function(parent, key) {
self.parents[key] = parent;
});
_.each(data['childs'], function(child, key) {
_.each(data.childs, function(child, key) {
self.childs[key] = child;
});
self.$input_dropdown.append(qweb.render('FieldChildSelectorChild', {
'childs': self.childs,
}));
self.$input_value.append(qweb.render('FieldChildSelectorParent', {
'parents': self.parents,
}));
self.$input_dropdown.append(
qweb.render("FieldChildSelectorChild", {
childs: self.childs,
})
);
self.$input_value.append(
qweb.render("FieldChildSelectorParent", {
parents: self.parents,
})
);
});
},
_onChildSelectionClick: function(event) {
var target = $(event.target);
var type = target.data('type');
if (type === 'clear') {
var type = target.data("type");
if (type === "clear") {
this._setValue({id: false});
}
else {
var index = target.data('index');
var value = (type === 'child') ? this.childs[index]: this.parents[index];
} else {
var index = target.data("index");
var value = type === "child" ? this.childs[index] : this.parents[index];
this._setValue({id: value[0], display_name: value[1]});
}
},
@ -76,6 +86,6 @@ odoo.define('web.web_widget_child_selector', function(require) {
},
});
field_registry.add('child_selector', FieldChildSelector);
field_registry.add("child_selector", FieldChildSelector);
return FieldChildSelector;
})
});

View File

@ -1,9 +1,9 @@
.o_child_selection_button {
cursor: pointer,
cursor: pointer;
}
.o_child_selection_label {
cursor: pointer,
cursor: pointer;
}
.o_child_selection_clear {

View File

@ -1,25 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<templates id="template" xml:space="preserve">
<t t-name="FieldChildSelector">
<!--<div class="o_element"/>-->
<t t-if="widget.mode === 'readonly'">
<a t-if="!widget.nodeOptions.no_open" t-att-tabindex="widget.attrs.tabindex" class="o_form_uri" href="#"/>
<span t-if="widget.nodeOptions.no_open"/>
<a
t-if="!widget.nodeOptions.no_open"
t-att-tabindex="widget.attrs.tabindex"
class="o_form_uri"
href="#"
/>
<span t-if="widget.nodeOptions.no_open" />
</t>
<div t-if="widget.mode === 'edit'" class="o_field_widget">
<span class="o_input_value"/>
<div class="o_input_dropdown"/>
<span class="o_input_value" />
<div class="o_input_dropdown" />
</div>
</t>
<t t-name="FieldChildSelectorChild">
<div class="row">
<div t-foreach="childs" t-as="key" class="col-xl-12">
<t t-set="id_for_label" t-value="'o_child_hierarchy_selector_' + _.uniqueId()"/>
<input type="radio" t-att-data-id="childs[key][0]" t-att-data-index="key"
t-att-id="id_for_label" data-type="child" class="o_child_selection_button"/>
<label class="o_form_label o_child_selection_label" t-att-for="id_for_label">
<t t-esc="childs[key][1]"/>
<t
t-set="id_for_label"
t-value="'o_child_hierarchy_selector_' + _.uniqueId()"
/>
<input
type="radio"
t-att-data-id="childs[key][0]"
t-att-data-index="key"
t-att-id="id_for_label"
data-type="child"
class="o_child_selection_button"
/>
<label
class="o_form_label o_child_selection_label"
t-att-for="id_for_label"
>
<t t-esc="childs[key][1]" />
</label>
</div>
</div>
@ -28,13 +45,21 @@
<span>
<t t-foreach="parents" t-as="key">
<t t-if="key > 0"> / </t>
<a t-att-data-id="parents[key][0]" t-att-data-index="key"
data-type="parent" class="o_child_selection_button">
<t t-esc="parents[key][1]"/>
<a
t-att-data-id="parents[key][0]"
t-att-data-index="key"
data-type="parent"
class="o_child_selection_button"
>
<t t-esc="parents[key][1]" />
</a>
</t>
<t t-if="Object.keys(parents).length > 0">
<i class="fa fa-times o_child_selection_button o_child_selection_clear" aria-hidden="false" data-type="clear"/>
<i
class="fa fa-times o_child_selection_button o_child_selection_clear"
aria-hidden="false"
data-type="clear"
/>
</t>
</span>
</t>

View File

@ -5,30 +5,25 @@ from odoo.tests.common import TransactionCase
class TestWidgetChildSelector(TransactionCase):
def setUp(self):
super().setUp()
ResPartner = self.env['res.partner'].with_context(tracking_disable=True)
self.partner_1 = ResPartner.create({'name': 'P1'})
self.partner_2 = ResPartner.create({
'name': 'P2',
'parent_id': self.partner_1.id
})
self.partner_3 = ResPartner.create({
'name': 'P3',
'parent_id': self.partner_2.id
})
ResPartner = self.env["res.partner"].with_context(tracking_disable=True)
self.partner_1 = ResPartner.create({"name": "P1"})
self.partner_2 = ResPartner.create(
{"name": "P2", "parent_id": self.partner_1.id}
)
self.partner_3 = ResPartner.create(
{"name": "P3", "parent_id": self.partner_2.id}
)
# Model that doesnt have the parent/child structure
self.group = self.env['res.groups'].create({
'name': 'Group'
})
self.group = self.env["res.groups"].create({"name": "Group"})
def test_widget_child_selector(self):
res = self.partner_2.get_record_direct_childs_parents(
{'child_selection_field': 'name'}
{"child_selection_field": "name"}
)
self.assertIn((self.partner_1.id, self.partner_1.name), res['parents'])
self.assertIn((self.partner_3.id, self.partner_3.name), res['childs'])
self.assertIn((self.partner_1.id, self.partner_1.name), res["parents"])
self.assertIn((self.partner_3.id, self.partner_3.name), res["childs"])
res = self.group.get_record_direct_childs_parents({})
self.assertFalse(res['parents'])
self.assertFalse(res['childs'])
self.assertFalse(res["parents"])
self.assertFalse(res["childs"])

View File

@ -1,9 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<template id="assets_backend" name="web_widget_child_selector" inherit_id="web.assets_backend">
<template
id="assets_backend"
name="web_widget_child_selector"
inherit_id="web.assets_backend"
>
<xpath expr="." position="inside">
<link rel="stylesheet" href="/web_widget_child_selector/static/src/less/widget_child_selector.less"/>
<script type="text/javascript" src="/web_widget_child_selector/static/src/js/widget_child_selector.js"/>
<link
rel="stylesheet"
href="/web_widget_child_selector/static/src/less/widget_child_selector.less"
/>
<script
type="text/javascript"
src="/web_widget_child_selector/static/src/js/widget_child_selector.js"
/>
</xpath>
</template>
</odoo>