Merge lp:~openerp-dev/openerp-web/trunk-stage-saas3-imp-tde into lp:openerp-web

[Thibault Delavallée (OpenERP)]

[IMP] form_view: statusbar widget: folded back as an option.

The widget option 'fold_field' allows to tell the widget to use this field on
the model used for stages to compute the folded selection.

If not set, no stage is folded.

=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2013-11-25 16:05:06 +0000
+++ addons/web/static/src/js/view_form.js	2013-11-27 10:00:43 +0000
@@ -5552,23 +5552,23 @@
         var self = this;
         var selection_unfolded = [];
         var selection_folded = [];
+        var fold_field = this.options.fold_field;
 
         var calculation = _.bind(function() {
             if (this.field.type == "many2one") {
-                /* :deprecated: fold feature will probably be removed */
-                // return self.get_distant_fields().then(function(fields) {
-                self.distant_fields = {};
-                return new instance.web.DataSetSearch(self, self.field.relation, self.build_context(), self.get("evaluated_selection_domain"))
-                    .read_slice(_.union(_.keys(self.distant_fields), ['id']), {}).then(function (records) {
-                        var ids = _.pluck(records, 'id');
-                        return self.dataset.name_get(ids).then(function (records_name) {
-                            _.each(records, function (record) {
-                                var name = _.find(records_name, function (val) {return val[0] == record.id;})[1];
-                                if (record.fold && record.id != self.get('value')) {
-                                    selection_folded.push([record.id, name]);
-                                } else {
-                                    selection_unfolded.push([record.id, name]);
-                                }
+                return self.get_distant_fields().then(function (fields) {
+                    return new instance.web.DataSetSearch(self, self.field.relation, self.build_context(), self.get("evaluated_selection_domain"))
+                        .read_slice(_.union(_.keys(self.distant_fields), ['id']), {}).then(function (records) {
+                            var ids = _.pluck(records, 'id');
+                            return self.dataset.name_get(ids).then(function (records_name) {
+                                _.each(records, function (record) {
+                                    var name = _.find(records_name, function (val) {return val[0] == record.id;})[1];
+                                    if (fold_field && record[fold_field] && record.id != self.get('value')) {
+                                        selection_folded.push([record.id, name]);
+                                    } else {
+                                        selection_unfolded.push([record.id, name]);
+                                    }
+                                });
                             });
                         });
                     });
@@ -5598,10 +5598,13 @@
      */
     get_distant_fields: function() {
         var self = this;
+        if (! this.options.fold_field) {
+            this.distant_fields = {}
+        }
         if (this.distant_fields) {
             return $.when(this.distant_fields);
         }
-        return new instance.web.Model(self.field.relation).call("fields_get", [["fold"]]).then(function(fields) {
+        return new instance.web.Model(self.field.relation).call("fields_get", [[this.options.fold_field]]).then(function(fields) {
             self.distant_fields = fields;
             return fields;
         });