Techsystech
/
web
mirror of https://github.com/OCA/web.git
3
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge PR #2111 into 14.0 

Signed-off-by pedrobaeza
pull/2125/head
OCA-git-bot 2022-01-07 15:50:09 +00:00
parent d1c2bc50ce e45c428d16
commit 9b552beb75
9 changed files with 120 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web_m2x_options/README.rst
View File

@ -115,6 +115,10 @@ If you disable one option, you can enable it for particular field by setting "cr
Whether the field should always show "Search more..." entry or not.
``web_m2x_options.field_limit_entries`` *int*
Number of displayed lines on all One2many fields
To add these parameters go to Configuration -> Technical -> Parameters -> System Parameters and add new parameters like:
- web_m2x_options.create: False
@ -122,6 +126,7 @@ To add these parameters go to Configuration -> Technical -> Parameters -> System
- web_m2x_options.m2o_dialog: False
- web_m2x_options.limit: 10
- web_m2x_options.search_more: True
- web_m2x_options.field_limit_entries: 5
Example
@ -178,6 +183,7 @@ Contributors
* Jairo Llopis <jairo.llopis@tecnativa.com>
* David Vidal <david.vidal@tecnativa.com>
* Ernesto Tejeda <ernesto.tejeda87@gmail.com>
* Carlos Roca
* Bhavesh Odedra <bodedra@opensourceintegrators.com>
* Dhara Solanki <dhara.solanki@initos.com> (http://www.initos.com)

6
web_m2x_options/models/ir_config_parameter.py
View File

@ -12,5 +12,9 @@ class IrConfigParameter(models.Model):
"web_m2x_options.limit",
"web_m2x_options.search_more",
"web_m2x_options.m2o_dialog",
"web_m2x_options.field_limit_entries",
]
return self.sudo().search_read([["key", "in", opts]], ["key", "value"])
return {
res["key"]: res["value"]
for res in self.sudo().search_read([["key", "in", opts]], ["key", "value"])
}

1
web_m2x_options/readme/CONTRIBUTORS.rst
View File

@ -9,5 +9,6 @@
* Jairo Llopis <jairo.llopis@tecnativa.com>
* David Vidal <david.vidal@tecnativa.com>
* Ernesto Tejeda <ernesto.tejeda87@gmail.com>
* Carlos Roca
* Bhavesh Odedra <bodedra@opensourceintegrators.com>
* Dhara Solanki <dhara.solanki@initos.com> (http://www.initos.com)

7
web_m2x_options/readme/USAGE.rst
View File

@ -37,7 +37,7 @@ in the field's options dict
``open`` *boolean* (Default: ``False``)
Makes many2many_tags buttons that open the linked resource
Makes many2many_tags and one2many rows buttons that open the linked resource
``no_color_picker`` *boolean* (Default: ``False``)
@ -69,6 +69,10 @@ If you disable one option, you can enable it for particular field by setting "cr
Whether the field should always show "Search more..." entry or not.
``web_m2x_options.field_limit_entries`` *int*
Number of displayed lines on all One2many fields
To add these parameters go to Configuration -> Technical -> Parameters -> System Parameters and add new parameters like:
- web_m2x_options.create: False
@ -76,6 +80,7 @@ To add these parameters go to Configuration -> Technical -> Parameters -> System
- web_m2x_options.m2o_dialog: False
- web_m2x_options.limit: 10
- web_m2x_options.search_more: True
- web_m2x_options.field_limit_entries: 5
Example

146
web_m2x_options/static/src/js/form.js
View File

@ -7,19 +7,23 @@ odoo.define("web_m2x_options.web_m2x_options", function (require) {
var core = require("web.core"),
data = require("web.data"),
Dialog = require("web.Dialog"),
FormView = require("web.FormView"),
view_dialogs = require("web.view_dialogs"),
relational_fields = require("web.relational_fields"),
rpc = require("web.rpc");
ir_options = require("web_m2x_options.ir_options");
var _t = core._t,
FieldMany2ManyTags = relational_fields.FieldMany2ManyTags,
FieldMany2One = relational_fields.FieldMany2One,
FieldOne2Many = relational_fields.FieldOne2Many,
FormFieldMany2ManyTags = relational_fields.FormFieldMany2ManyTags;
var web_m2x_options = rpc.query({
model: "ir.config_parameter",
method: "get_web_m2x_options",
});
function is_option_set(option) {
if (_.isUndefined(option)) return false;
if (typeof option === "string") return option === "true" || option === "True";
if (typeof option === "boolean") return option;
return false;
}
var M2ODialog = Dialog.extend({
template: "M2ODialog",
@ -93,43 +97,13 @@ odoo.define("web_m2x_options.web_m2x_options", function (require) {
});
FieldMany2One.include({
start: function () {
this._super.apply(this, arguments);
return this.get_options();
},
get_options: function () {
var self = this;
if (_.isUndefined(this.ir_options_loaded)) {
this.ir_options_loaded = $.Deferred();
this.ir_options = {};
web_m2x_options.then(function (records) {
_(records).each(function (record) {
self.ir_options[record.key] = record.value;
});
self.ir_options_loaded.resolve();
});
}
return $.when();
},
is_option_set: function (option) {
if (_.isUndefined(option)) return false;
if (typeof option === "string")
return option === "true" || option === "True";
if (typeof option === "boolean") return option;
return false;
},
_onInputFocusout: function () {
var m2o_dialog_opt =
this.is_option_set(this.nodeOptions.m2o_dialog) ||
is_option_set(this.nodeOptions.m2o_dialog) ||
(_.isUndefined(this.nodeOptions.m2o_dialog) &&
this.is_option_set(
this.ir_options["web_m2x_options.m2o_dialog"]
)) ||
is_option_set(ir_options["web_m2x_options.m2o_dialog"])) ||
(_.isUndefined(this.nodeOptions.m2o_dialog) &&
_.isUndefined(this.ir_options["web_m2x_options.m2o_dialog"]));
_.isUndefined(ir_options["web_m2x_options.m2o_dialog"]));
if (this.can_create && this.floating && m2o_dialog_opt) {
new M2ODialog(this, this.string, this.$input.val()).open();
}
@ -137,14 +111,12 @@ odoo.define("web_m2x_options.web_m2x_options", function (require) {
_search: function (search_val) {
var self = this;
if (search_val === undefined) {
return this._super.apply(this, arguments);
}
var def = new Promise((resolve) => {
// Add options limit used to change number of selections record
// returned.
if (!_.isUndefined(self.ir_options["web_m2x_options.limit"])) {
this.limit = parseInt(self.ir_options["web_m2x_options.limit"], 10);
if (!_.isUndefined(ir_options["web_m2x_options.limit"])) {
this.limit = parseInt(ir_options["web_m2x_options.limit"], 10);
}
if (typeof self.nodeOptions.limit === "number") {
@ -230,14 +202,12 @@ odoo.define("web_m2x_options.web_m2x_options", function (require) {
// 4- if set globally, apply its value
// 5- if not set globally either, check if returned values are more than node's limit
if (!_.isUndefined(self.nodeOptions.search_more)) {
var search_more = self.is_option_set(
self.nodeOptions.search_more
);
var search_more = is_option_set(self.nodeOptions.search_more);
} else if (
!_.isUndefined(self.ir_options["web_m2x_options.search_more"])
!_.isUndefined(ir_options["web_m2x_options.search_more"])
) {
var search_more = self.is_option_set(
self.ir_options["web_m2x_options.search_more"]
var search_more = is_option_set(
ir_options["web_m2x_options.search_more"]
);
} else {
var search_more = values.length > self.limit;
@ -299,13 +269,13 @@ odoo.define("web_m2x_options.web_m2x_options", function (require) {
var raw_result = _.map(result, function (x) {
return x[1];
});
var quick_create = self.is_option_set(self.nodeOptions.create),
var quick_create = is_option_set(self.nodeOptions.create),
quick_create_undef = _.isUndefined(self.nodeOptions.create),
m2x_create_undef = _.isUndefined(
self.ir_options["web_m2x_options.create"]
ir_options["web_m2x_options.create"]
),
m2x_create = self.is_option_set(
self.ir_options["web_m2x_options.create"]
m2x_create = is_option_set(
ir_options["web_m2x_options.create"]
);
var show_create =
(!self.nodeOptions && (m2x_create_undef || m2x_create)) ||
@ -332,16 +302,16 @@ odoo.define("web_m2x_options.web_m2x_options", function (require) {
// Create and edit ...
var create_edit =
self.is_option_set(self.nodeOptions.create) ||
self.is_option_set(self.nodeOptions.create_edit),
is_option_set(self.nodeOptions.create) ||
is_option_set(self.nodeOptions.create_edit),
create_edit_undef =
_.isUndefined(self.nodeOptions.create) &&
_.isUndefined(self.nodeOptions.create_edit),
m2x_create_edit_undef = _.isUndefined(
self.ir_options["web_m2x_options.create_edit"]
ir_options["web_m2x_options.create_edit"]
),
m2x_create_edit = self.is_option_set(
self.ir_options["web_m2x_options.create_edit"]
m2x_create_edit = is_option_set(
ir_options["web_m2x_options.create_edit"]
);
var show_create_edit =
(!self.nodeOptions &&
@ -381,6 +351,17 @@ odoo.define("web_m2x_options.web_m2x_options", function (require) {
});
});
this.orderer.add(def);
// Add options limit used to change number of selections record
// returned.
if (!_.isUndefined(ir_options["web_m2x_options.limit"])) {
this.limit = parseInt(ir_options["web_m2x_options.limit"], 10);
}
if (typeof this.nodeOptions.limit === "number") {
this.limit = this.nodeOptions.limit;
}
return def;
},
});
@ -396,17 +377,9 @@ odoo.define("web_m2x_options.web_m2x_options", function (require) {
return result;
},
is_option_set: function (option) {
if (_.isUndefined(option)) return false;
if (typeof option === "string")
return option === "true" || option === "True";
if (typeof option === "boolean") return option;
return false;
},
_onOpenBadge: function (event) {
var self = this;
var open = self.nodeOptions && self.is_option_set(self.nodeOptions.open);
var open = self.nodeOptions && is_option_set(self.nodeOptions.open);
if (open) {
var context = self.record.getContext(self.recordParams);
var id = parseInt($(event.currentTarget).data("id"), 10);
@ -462,14 +435,37 @@ odoo.define("web_m2x_options.web_m2x_options", function (require) {
},
});
FieldOne2Many.include({
_onOpenRecord: function (ev) {
var self = this;
var open = this.nodeOptions.open;
if (open && self.mode === "readonly") {
ev.stopPropagation();
var id = ev.data.id;
var res_id = self.record.data[self.name].data.filter(
(line) => line.id === id
)[0].res_id;
self._rpc({
model: self.field.relation,
method: "get_formview_action",
args: [[res_id]],
}).then(function (action) {
return self.do_action(action);
});
} else {
return this._super.apply(this, arguments);
}
},
});
FormFieldMany2ManyTags.include({
events: _.extend({}, FormFieldMany2ManyTags.prototype.events, {
"click .badge": "_onOpenBadge",
}),
_onOpenBadge: function (event) {
var open = this.is_option_set(this.nodeOptions.open);
var no_color_picker = this.is_option_set(this.nodeOptions.no_color_picker);
var open = is_option_set(this.nodeOptions.open);
var no_color_picker = is_option_set(this.nodeOptions.no_color_picker);
this._super.apply(this, arguments);
if (!open && !no_color_picker) {
this._onOpenColorPicker(event);
@ -479,4 +475,16 @@ odoo.define("web_m2x_options.web_m2x_options", function (require) {
}
},
});
// Extending class to allow change the limit of o2m registry entries using the
// system parameter "web_m2x_options.field_limit_entries".
FormView.include({
_setSubViewLimit: function (attrs) {
this._super(attrs);
var limit = ir_options["web_m2x_options.field_limit_entries"];
if (!_.isUndefined(limit)) {
attrs.limit = parseInt(limit);
}
},
});
});

12
web_m2x_options/static/src/js/ir_options.js 100644
View File

@ -0,0 +1,12 @@
/* Copyright 2020 Tecnativa - Carlos Roca
* * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */
odoo.define("web_m2x_options.ir_options", function (require) {
"use strict";
var rpc = require("web.rpc");
return rpc.query({
model: "ir.config_parameter",
method: "get_web_m2x_options",
});
});

2
web_m2x_options/static/src/xml/base.xml
View File

@ -5,7 +5,7 @@
<t t-extend="FieldMany2One">
<t t-jquery=".o_external_button" t-operation="attributes">
<attribute name="t-if">
!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit)
!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit || widget.noOpen)
</attribute>
</t>
</t>

16
web_m2x_options/tests/test_ir_config_parameter.py
View File

@ -16,15 +16,13 @@ class TestIrConfigParameter(common.SavepointCase):
def test_web_m2x_options_key(self):
web_m2x_options = self.env["ir.config_parameter"].get_web_m2x_options()
options = {opt["key"]: opt["value"] for opt in web_m2x_options}
self.assertIn("web_m2x_options.limit", options)
self.assertNotIn("web_m2x_options.m2o_dialog_test", options)
self.assertIn("web_m2x_options.limit", web_m2x_options)
self.assertNotIn("web_m2x_options.m2o_dialog_test", web_m2x_options)
def test_web_m2x_options_value(self):
web_m2x_options = self.env["ir.config_parameter"].get_web_m2x_options()
options = {opt["key"]: opt["value"] for opt in web_m2x_options}
self.assertEqual(options["web_m2x_options.limit"], "10")
self.assertTrue(bool(options["web_m2x_options.create_edit"]))
self.assertTrue(bool(options["web_m2x_options.create"]))
self.assertEqual(options["web_m2x_options.search_more"], "False")
self.assertTrue(bool(options["web_m2x_options.m2o_dialog"]))
self.assertEqual(web_m2x_options["web_m2x_options.limit"], "10")
self.assertTrue(bool(web_m2x_options["web_m2x_options.create_edit"]))
self.assertTrue(bool(web_m2x_options["web_m2x_options.create"]))
self.assertEqual(web_m2x_options["web_m2x_options.search_more"], "False")
self.assertTrue(bool(web_m2x_options["web_m2x_options.m2o_dialog"]))

4
web_m2x_options/views/view.xml
View File

@ -10,6 +10,10 @@
type="text/javascript"
src="/web_m2x_options/static/src/js/form.js"
/>
<script
type="text/javascript"
src="/web_m2x_options/static/src/js/ir_options.js"
/>
</xpath>
</template>
</odoo>