From ce36cbdcb9fd418e00123dc4cb0a063890c933fa Mon Sep 17 00:00:00 2001
From: fwi-odoo <fwi@odoo.com>
Date: Wed, 17 May 2017 13:53:48 +0200
Subject: [PATCH] [FIX] web: load subviews in the correct function

Before this commit, it was impossible to load the x2many fields subviews when
they were not defined inline.
Now it is possible to call the method "_loadSubviews" to do so.
Used mainly in studio, to be able to display the x2many fields without inline
views.
---
 .../web/static/src/js/views/abstract_view.js  | 58 ++++++++++++++++++-
 .../web/static/src/js/views/form/form_view.js | 32 +---------
 2 files changed, 58 insertions(+), 32 deletions(-)

diff --git a/addons/web/static/src/js/views/abstract_view.js b/addons/web/static/src/js/views/abstract_view.js
index e14e064ee33..4c43a692601 100644
--- a/addons/web/static/src/js/views/abstract_view.js
+++ b/addons/web/static/src/js/views/abstract_view.js
@@ -24,6 +24,7 @@ odoo.define('web.AbstractView', function (require) {
  */
 
 var Class = require('web.Class');
+var Context = require('web.Context');
 var ajax = require('web.ajax');
 var AbstractModel = require('web.AbstractModel');
 var AbstractRenderer = require('web.AbstractRenderer');
@@ -150,6 +151,12 @@ var AbstractView = Class.extend({
             return controller;
         });
     },
+    /**
+     * Returns the view model or create an instance of it if there is noney
+     *
+     * @param {Widget} parent the parent of the model
+     * @return {Object} instance of the view model
+     */
     getModel: function (parent) {
         if (!this.model) {
             var Model = this.config.Model;
@@ -157,6 +164,13 @@ var AbstractView = Class.extend({
         }
         return this.model;
     },
+    /**
+     * Returns the a new view renderer instance
+     *
+     * @param {Widget} parent the parent of the model
+     * @param {Object} state the information related to the rendered view
+     * @return {Object} instance of the view renderer
+     */
     getRenderer: function (parent, state) {
         var Renderer = this.config.Renderer;
         return new Renderer(parent, state, this.rendererParams);
@@ -179,7 +193,7 @@ var AbstractView = Class.extend({
      * Load initial data from the model
      *
      * @private
-     * @param {Widget} parent the parent of the model, if it has to be created
+     * @param {Widget} parent the parent of the model
      * @returns {Deferred<*>} a deferred that resolves to whatever the model
      *   decide to return
      */
@@ -221,6 +235,48 @@ var AbstractView = Class.extend({
         });
         return $.when.apply($, defs);
     },
+    /**
+     * Loads the subviews for x2many fields when they are not inline
+     *
+     * @private
+     * @param {Widget} parent the parent of the model
+     * @returns {Deferred}
+     */
+    _loadSubviews: function (parent) {
+        var self = this;
+        var defs = [];
+        if (this.loadParams && this.loadParams.fieldsInfo) {
+            var fields = this.loadParams.fields;
+
+            _.each(this.loadParams.fieldsInfo.form, function (attrs, fieldName) {
+                var field = fields[fieldName];
+                if (field.type !== 'one2many' && field.type !== 'many2many') {
+                    return;
+                }
+
+                attrs.limit = attrs.mode === "tree" ? 80 : 40;
+
+                if (attrs.Widget.prototype.useSubview && !(attrs.invisible && JSON.parse(attrs.invisible)) && !attrs.views[attrs.mode]) {
+                    var context = {};
+                    var regex = /'([a-z]*_view_ref)' *: *'(.*?)'/g;
+                    var matches;
+                    while (matches = regex.exec(attrs.context)) {
+                        context[matches[1]] = matches[2];
+                    }
+                    defs.push(parent.loadViews(
+                            field.relation,
+                            new Context(context, self.userContext),
+                            [[null, attrs.mode === 'tree' ? 'list' : attrs.mode]])
+                        .then(function (views) {
+                            for (var viewName in views) {
+                                attrs.views[viewName] = views[viewName];
+                            }
+                        }));
+                }
+            });
+        }
+        return $.when.apply($, defs);
+    }
 });
 
 return AbstractView;
diff --git a/addons/web/static/src/js/views/form/form_view.js b/addons/web/static/src/js/views/form/form_view.js
index aa6bdf69755..f0264b67307 100644
--- a/addons/web/static/src/js/views/form/form_view.js
+++ b/addons/web/static/src/js/views/form/form_view.js
@@ -51,37 +51,7 @@ var FormView = BasicView.extend({
      * @override
      */
     getController: function (parent) {
-        var self = this;
-        var defs = [];
-        var fields = this.loadParams.fields;
-
-        _.each(self.loadParams.fieldsInfo.form, function (attrs, fieldName) {
-            var field = fields[fieldName];
-            if (field.type !== 'one2many' && field.type !== 'many2many') {
-                return;
-            }
-
-            attrs.limit = attrs.mode === "tree" ? 80 : 40;
-
-            if (attrs.Widget.prototype.useSubview && !(attrs.invisible && JSON.parse(attrs.invisible)) && !attrs.views[attrs.mode]) {
-                var context = {};
-                var regex = /'([a-z]*_view_ref)' *: *'(.*?)'/g;
-                var matches;
-                while (matches = regex.exec(attrs.context)) {
-                    context[matches[1]] = matches[2];
-                }
-                defs.push(parent.loadViews(
-                        field.relation,
-                        new Context(context, self.userContext),
-                        [[null, attrs.mode === 'tree' ? 'list' : attrs.mode]])
-                    .then(function (views) {
-                        for (var viewName in views) {
-                            attrs.views[viewName] = views[viewName];
-                        }
-                    }));
-            }
-        });
-        return $.when.apply($, defs).then(this._super.bind(this, parent));
+        return this._loadSubviews(parent).then(this._super.bind(this, parent));
     },
 });