diff options
| author | Martin Trigaux <mat@odoo.com> | 2015-12-30 11:36:31 +0100 |
|---|---|---|
| committer | Martin Trigaux <mat@odoo.com> | 2015-12-30 11:48:14 +0100 |
| commit | 955ed51687de4aaa563a3258b5a1861efad0e8b1 (patch) | |
| tree | fff61a98e0f7a276bfedab04b527efce5ba3e691 /addons/web/static/src | |
| parent | cccec4ac623a6d612a9395fc412a89e1f2b67eb4 (diff) | |
| parent | 6efc371291951a3683b4aa30630781c478ea445f (diff) | |
[MERGE] Forwardport of branch 8.0 up to 6efc3712
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 10 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 80d32ee6529..5786f6470b3 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -4363,7 +4363,6 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({ }); instance.web.form.One2ManyViewManager = instance.web.ViewManager.extend({ - template: 'One2Many.viewmanager', init: function(parent, dataset, views, flags) { this._super(parent, dataset, views, _.extend({}, flags, {$sidebar: false})); this.registry = instance.web.views.extend({ @@ -4611,7 +4610,14 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({ } return this._super(record); - } + }, + reload_content: function () { + this.page = Math.min( + this.page, + Math.ceil(this.dataset.size() / this.limit()) - 1 + ); + return this._super.apply(this, arguments); + }, }); instance.web.form.One2ManyGroups = instance.web.ListView.Groups.extend({ setup_resequence_rows: function () { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 39173add5c6..6f7e88aa34f 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1589,12 +1589,6 @@ </t> </a> </t> - -<t t-name="One2Many.viewmanager" t-extend="ViewManager"> - <t t-jquery=".oe-view-manager-header"> - this.attr('t-if', 'widget.view_order.length != 1'); - </t> -</t> <t t-name="One2Many.formview" t-extend="FormView"> <t t-jquery=".oe_form_buttons" t-operation="inner"> <button type="button" class="oe_button oe_form_button_create">Add</button> |