Merge lp:~openerp-dev/openerp-web/saas-2-stages-fold-tde into lp:openerp-web

[Christophe Simonis (OpenERP)]

[IMP] form_view: statusbar: deprecated the folded feature from the widget.

[Christophe Simonis (OpenERP) (kangol)]

no change in saas-2
may be do the bar_{fold,color} in trunk

review: Disapprove

[lp:~openerp-dev/openerp-web/saas-2-stages-fold-tde]

3861. By Thibault Delavallée (OpenERP) on 2013-11-04

[MERGE] Sync with saas-2 branch

3862. By Thibault Delavallée (OpenERP) on 2013-11-04

[REV] Reverted most changes, to lessen the number of
changed in a stable branch.

3863. By Thibault Delavallée (OpenERP) on 2013-11-04

[REV] view_form: statusbar widget: indentation issue + reverted some more changes

[Thibault Delavallée (OpenERP) (tde-openerp)]

Actually the branch was not up-to-date. The purpose of this branch is to deprecate the folding feature in the statusbar widget. I removed a call in the JS, and added some deprecated comments to avoid removing code.

=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2013-10-28 15:00:19 +0000
+++ addons/web/static/src/js/view_form.js	2013-11-04 12:04:06 +0000
@@ -5550,23 +5550,23 @@
 
         var calculation = _.bind(function() {
             if (this.field.type == "many2one") {
-                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(fields.fold ? ['fold'] : ['id'], {}).then(function (records) {
-
-                            var ids = _.map(records, function (val) {return val.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]);
-                                    }
-                                });
+                /* :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]);
+                                }
                             });
                         });
-                });
+                    });
             } else {
                 // For field type selection filter values according to
                 // statusbar_visible attribute of the field. For example:
@@ -5588,6 +5588,9 @@
             }
         });
     },
+    /*
+     * :deprecated: this feature will probably be removed with OpenERP v8
+     */
     get_distant_fields: function() {
         var self = this;
         if (this.distant_fields) {