diff options
| author | Christophe Simonis <chs@odoo.com> | 2014-06-10 13:15:46 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2014-06-10 13:15:46 +0200 |
| commit | a7c212573526436553505eeebec2069e60fd5f32 (patch) | |
| tree | ee1ffb56d841892937d4cea4ddba0f53bd29c8b1 /addons/web/static/src | |
| parent | 286ced7183b746c9f580d47679150100068fe005 (diff) | |
| parent | 6b8e9727e5ab2e7b841c307d4700934048af8d37 (diff) | |
[MERGE] forward port of branch saas-4 up to 6b8e972
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 3 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index a4ecc4e17d9..b6ff72cfcde 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -4858,7 +4858,8 @@ instance.web.form.Many2ManyListView = instance.web.ListView.extend(/** @lends in pop.select_element( this.model, { - title: _t("Add: ") + this.m2m_field.string + title: _t("Add: ") + this.m2m_field.string, + no_create: this.m2m_field.options.no_create, }, new instance.web.CompoundDomain(this.m2m_field.build_domain(), ["!", ["id", "in", this.m2m_field.dataset.ids]]), this.m2m_field.build_context() diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 6363f618c5c..de544c7dff8 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1504,8 +1504,9 @@ <t t-if="! widget.options.disable_multiple_selection"> <button type="button" class="oe_button oe_selectcreatepopup-search-select oe_highlight" disabled="disabled">Select</button> </t> + <t t-if="!widget.options.no_create"> <button type="button" class="oe_button oe_selectcreatepopup-search-create">Create</button> - or <a class="oe_selectcreatepopup-search-close oe_bold oe_form_button_cancel" href="javascript:void(0)">Cancel</a> + or </t><a class="oe_selectcreatepopup-search-close oe_bold oe_form_button_cancel" href="javascript:void(0)">Cancel</a> </t> <t t-name="AbstractFormPopup.buttons"> <t t-if="! readonly"> |