From 4107dc11deb596a0a320bcf6f5c7c811376bbd7d Mon Sep 17 00:00:00 2001 From: Prakash Prajapati Date: Thu, 4 Apr 2019 13:17:49 +0000 Subject: [PATCH] [ADD] web: Allow to add multiple records in m2m_tags widget. Before this commit when user want to add multiple record at that time they only allow to add one record at a time. After this commit user can add multiple record from search more wizard. Added function _getSearchCreatePopupOptions so that it can be overridden in FieldMany2ManyTags, options for FieldMany2ManyTags will differ, like FieldMany2ManyTags SearchCreateDailog should have multi record selection, Many2ManyTags' SelectCreateDialog should display record other than selected This commit is related to task id: 1945912 closes odoo/odoo#32453 Signed-off-by: VincentSchippefilt Co-authored-by: Mohammed Shekha --- .../static/src/js/fields/relational_fields.js | 53 +++++++++---- .../field_many2many_tests.js | 79 +++++++++++++++++++ 2 files changed, 117 insertions(+), 15 deletions(-) diff --git a/addons/web/static/src/js/fields/relational_fields.js b/addons/web/static/src/js/fields/relational_fields.js index 325e0ceb8e8..398928f585b 100644 --- a/addons/web/static/src/js/fields/relational_fields.js +++ b/addons/web/static/src/js/fields/relational_fields.js @@ -376,6 +376,29 @@ var FieldMany2One = AbstractField.extend({ _getDisplayName: function (value) { return value.split('\n')[0]; }, + /** + * Prepares and returns options for SelectCreateDialog + * + * @private + */ + _getSearchCreatePopupOptions: function(view, ids, context, dynamicFilters) { + var self = this; + return { + res_model: this.field.relation, + domain: this.record.getDomain({fieldName: this.name}), + context: _.extend({}, this.record.getContext(this.recordParams), context || {}), + dynamicFilters: dynamicFilters || [], + title: (view === 'search' ? _t("Search: ") : _t("Create: ")) + this.string, + initial_ids: ids, + initial_view: view, + disable_multiple_selection: true, + no_create: !self.can_create, + on_selected: function (records) { + self.reinitialize(records[0]); + self.activate(); + } + }; + }, /** * Listens to events 'field_changed' to keep track of the last event that * has been trigerred. This allows to detect that all changes have been @@ -613,21 +636,8 @@ var FieldMany2One = AbstractField.extend({ */ _searchCreatePopup: function (view, ids, context, dynamicFilters) { var self = this; - return new dialogs.SelectCreateDialog(this, _.extend({}, this.nodeOptions, { - res_model: this.field.relation, - domain: this.record.getDomain({fieldName: this.name}), - context: _.extend({}, this.record.getContext(this.recordParams), context || {}), - dynamicFilters: dynamicFilters || [], - title: (view === 'search' ? _t("Search: ") : _t("Create: ")) + this.string, - initial_ids: ids, - initial_view: view, - disable_multiple_selection: true, - no_create: !self.can_create, - on_selected: function (records) { - self.reinitialize(records[0]); - self.activate(); - } - })).open(); + var options = this._getSearchCreatePopupOptions(view, ids, context, dynamicFilters); + return new dialogs.SelectCreateDialog(this, _.extend({}, this.nodeOptions, options)).open(); }, /** * @private @@ -2119,6 +2129,19 @@ var FieldMany2ManyTags = AbstractField.extend({ this.many2one._getSearchBlacklist = function () { return self.value.res_ids; }; + var _getSearchCreatePopupOptions = this.many2one._getSearchCreatePopupOptions; + this.many2one._getSearchCreatePopupOptions = function (view, ids, context, dynamicFilters) { + var options = _getSearchCreatePopupOptions.apply(this, arguments); + var domain = this.record.getDomain({fieldName: this.name}); + return _.extend({}, options, { + domain: domain.concat(["!", ["id", "in", self.value.res_ids]]), + disable_multiple_selection: false, + on_selected: function (records) { + self.many2one.reinitialize(records); + self.many2one.activate(); + } + }); + }; return this.many2one.appendTo(this.$el); }, /** diff --git a/addons/web/static/tests/fields/relational_fields/field_many2many_tests.js b/addons/web/static/tests/fields/relational_fields/field_many2many_tests.js index e20ad604c98..cf19fe30fe6 100644 --- a/addons/web/static/tests/fields/relational_fields/field_many2many_tests.js +++ b/addons/web/static/tests/fields/relational_fields/field_many2many_tests.js @@ -1022,6 +1022,85 @@ QUnit.module('fields', {}, function () { form.destroy(); }); + QUnit.test('many2many tags widget: select multiple records', async function (assert) { + assert.expect(5); + for (var i = 1; i <= 10; i++) { + this.data.partner_type.records.push({ id: 100 + i, display_name: "Partner" + i}); + } + var form = await createView({ + View: FormView, + model: 'partner', + data: this.data, + arch: '
' + + '' + + '' + + '', + res_id: 1, + archs: { + 'partner_type,false,list': '', + 'partner_type,false,search': '', + }, + }); + await testUtils.form.clickEdit(form); + await testUtils.fields.many2one.clickOpenDropdown('timmy'); + await testUtils.fields.many2one.clickItem('timmy','Search More'); + assert.ok($('.modal .o_list_view'), "should have open the modal"); + + // + 1 for the select all + assert.containsN($(document),'.modal .o_list_view .o_list_record_selector input', this.data.partner_type.records.length + 1, + "Should have record selector checkboxes to select multiple records"); + //multiple select tag + await testUtils.dom.click($('.modal .o_list_view thead .o_list_record_selector input')); + assert.ok(!$('.modal .o_select_button').prop('disabled'), "select button should be enabled"); + await testUtils.dom.click($('.o_select_button')); + assert.containsNone($(document),'.modal .o_list_view', "should have closed the modal"); + assert.containsN(form, '.o_field_many2manytags[name="timmy"] .badge', this.data.partner_type.records.length, + "many2many tag should now contain 12 records"); + form.destroy(); + }); + + QUnit.test("many2many tags widget: select multiple records doesn't show already added tags", async function (assert) { + assert.expect(5); + for (var i = 1; i <= 10; i++) { + this.data.partner_type.records.push({ id: 100 + i, display_name: "Partner" + i}); + } + var form = await createView({ + View: FormView, + model: 'partner', + data: this.data, + arch: '
' + + '' + + '' + + '', + res_id: 1, + archs: { + 'partner_type,false,list': '', + 'partner_type,false,search': '', + }, + }); + await testUtils.form.clickEdit(form); + + + await testUtils.fields.many2one.clickOpenDropdown('timmy'); + await testUtils.fields.many2one.clickItem('timmy','Partner1'); + + await testUtils.fields.many2one.clickOpenDropdown('timmy'); + await testUtils.fields.many2one.clickItem('timmy','Search More'); + assert.ok($('.modal .o_list_view'), "should have open the modal"); + + // -1 for the one that is already on the form & +1 for the select all, + assert.containsN($(document), '.modal .o_list_view .o_list_record_selector input', this.data.partner_type.records.length - 1 + 1, + "Should have record selector checkboxes to select multiple records"); + //multiple select tag + await testUtils.dom.click($('.modal .o_list_view thead .o_list_record_selector input')); + assert.ok(!$('.modal .o_select_button').prop('disabled'), "select button should be enabled"); + await testUtils.dom.click($('.o_select_button')); + assert.containsNone($(document),'.modal .o_list_view', "should have closed the modal"); + assert.containsN(form, '.o_field_many2manytags[name="timmy"] .badge', this.data.partner_type.records.length, + "many2many tag should now contain 12 records"); + form.destroy(); + }); + QUnit.test('many2many list add *many* records, remove, re-add', async function (assert) { assert.expect(5);