diff options
| author | fja-odoo <fja@odoo.com> | 2020-02-06 17:14:54 +0000 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2020-02-11 17:35:06 +0000 |
| commit | 07bb2e4591eb440bfda7e933834565f352176393 (patch) | |
| tree | d56f513867cd1cd07e3f08eeea55d2c96ff2154f /addons/website_form/static | |
| parent | 25d70fc5c9a7b409251a76bd9e681ec665fc258c (diff) | |
[FIX] website_form, *: add submit btn position option
* = website_crm, website_hr_recruitment, website_sale
It is now possible to change the position of the submit button via
the left panel. Indeed switching to a non-horizontal form left the
submit button aligned with the labels which thus appeared broken.
Part of https://github.com/odoo/odoo/pull/44907
task-2191409
X-original-commit: 60b4c8d04006736be573189accd0dccaafafa651
Diffstat (limited to 'addons/website_form/static')
| -rw-r--r-- | addons/website_form/static/src/snippets/s_website_form/001.scss | 12 | ||||
| -rw-r--r-- | addons/website_form/static/src/snippets/s_website_form/options.js | 14 |
2 files changed, 17 insertions, 9 deletions
diff --git a/addons/website_form/static/src/snippets/s_website_form/001.scss b/addons/website_form/static/src/snippets/s_website_form/001.scss index 561ac208543..cb0ad2e2c2b 100644 --- a/addons/website_form/static/src/snippets/s_website_form/001.scss +++ b/addons/website_form/static/src/snippets/s_website_form/001.scss @@ -38,4 +38,16 @@ padding-top: 0.5rem; padding-bottom: 0.5rem; } + + .s_website_form_submit { + .s_website_form_label { + float: left; + height: 1px; + } + &.s_website_form_no_submit_label { + .s_website_form_label { + display: none; + } + } + } } diff --git a/addons/website_form/static/src/snippets/s_website_form/options.js b/addons/website_form/static/src/snippets/s_website_form/options.js index 4bd19093345..13416ee38ae 100644 --- a/addons/website_form/static/src/snippets/s_website_form/options.js +++ b/addons/website_form/static/src/snippets/s_website_form/options.js @@ -33,13 +33,10 @@ const FormEditor = options.Class.extend({ } // Set selection as records to avoid added conplexity if (field.type === 'selection') { - field.records = []; - field.selection.forEach(el => { - field.records.push({ - id: el[0], - display_name: el[1], - }); - }); + field.records = field.selection.map(el => ({ + id: el[0], + display_name: el[1], + })); } else if (field.relation && field.relation !== 'ir.attachment') { field.records = await this._rpc({ model: field.relation, @@ -86,9 +83,8 @@ const FormEditor = options.Class.extend({ * @returns {Object} */ _getDefaultFormat: function () { - const formOptions = this.el.closest('.o_we_customize_panel'); return { - labelWidth: formOptions && formOptions.querySelector('we-customizeblock-options [data-select-style] input').value + 'px', + labelWidth: this.$target[0].querySelector('.s_website_form_label').style.width, labelPosition: 'left', multiPosition: 'horizontal', requiredMark: this._isRequiredMark(), |