diff options
| author | Christophe Simonis <chs@odoo.com> | 2014-06-10 12:29:47 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2014-06-10 12:29:47 +0200 |
| commit | 6b8e9727e5ab2e7b841c307d4700934048af8d37 (patch) | |
| tree | 771c742ebf5a550f9bd9c9389ce82a260ff71ac1 /addons/web/static/src | |
| parent | 6eacf9167177b3809700b1ae96604fef03fb226b (diff) | |
| parent | 4601d859440c7be464c670741e434a012e16d3b3 (diff) | |
[MERGE] forward port of branch saas-3 up to 4601d85
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 dee685602ff..8bf948513a7 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -4732,7 +4732,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 3a2f22e78a1..6017dcf2e50 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1472,8 +1472,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"> |