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

[Thibault Delavallée (OpenERP)]

[IMP] form_view: statusbar improvements
It now uses the bar_fold field instead of the fold field
to hide the stage.
It now uses bar_color to personnalize the stage.

Added css for oe_bar_1 (still WIP, just for testing purpose)

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

3857. By Thibault Delavallée (OpenERP) on 2013-10-21

[REV] StatusField: reverted changes about bar widget color and thing slike that.

3858. By Thibault Delavallée (OpenERP) on 2013-10-21

[MERGE] Sync with saas-2 branch

3859. By Thibault Delavallée (OpenERP) on 2013-10-23

[MERGE] Sync with saas-2

3860. By Thibault Delavallée (OpenERP) on 2013-10-23

[IMP] view_form: fieldstatus: deprecated folded on widget

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

Unmerged revisions

=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2013-10-22 13:34:32 +0000
+++ addons/web/static/src/js/view_form.js	2013-10-23 12:08:17 +0000
@@ -5556,23 +5556,30 @@
 
         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];
+                                var widget_item = {
+                                    'id': record.id,
+                                    'name': name,
+                                    /* :deprecated: should probably be removed */
+                                    'bar_color': record.bar_color || 0,
+                                    'bar_fold': record.bar_fold || false,
+                                }
+                                if (record.bar_fold && record.id != self.get('value')) {
+                                    selection_folded.push(widget_item);
+                                } else {
+                                    selection_unfolded.push(widget_item);
+                                }
                             });
                         });
-                });
+                    });
             } else {
                 // For field type selection filter values according to
                 // statusbar_visible attribute of the field. For example:
@@ -5594,12 +5601,15 @@
             }
         });
     },
+    /*
+     * :deprecated: this feature will probably be removed with OpenERP v8
+     */
     get_distant_fields: function() {
         var self = this;
         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", [["bar_fold", "bar_color"]]).then(function(fields) {
             self.distant_fields = fields;
             return fields;
         });

=== modified file 'addons/web/static/src/xml/base.xml'
--- addons/web/static/src/xml/base.xml	2013-10-23 11:34:14 +0000
+++ addons/web/static/src/xml/base.xml	2013-10-23 12:08:17 +0000
@@ -1222,9 +1222,9 @@
     <ul t-att-class="'oe_form_field_status ' + (widget.options.clickable ? 'oe_form_status_clickable' : 'oe_form_status')" t-att-style="widget.node.attrs.style"/>
 </t>
 <t t-name="FieldStatus.content">
-    <t t-foreach="widget.selection.unfolded" t-as="i">
-        <li t-att-class="i[0] === widget.get('value') ? 'oe_active' : ''" t-att-data-id="i[0]">
-            <span class="label"><t t-esc="i[1]"/></span>
+    <t t-foreach="widget.selection.unfolded" t-as="item">
+        <li t-attf-class="#{item.id === widget.get('value') and 'oe_active'}" t-att-data-id="item.id">
+            <span class="label"><t t-esc="item.name"/></span>
             <!-- are you mit ? -->
             <span class="arrow"><span></span></span>
         </li>
@@ -1233,9 +1233,9 @@
         <li>
             <span class="label oe_dropdown_toggle oe_dropdown_arrow">More</span>
             <ul class="oe_dropdown_menu">
-                <t t-foreach="widget.selection.folded" t-as="i">
-                    <li t-att-class="i[0] === widget.get('value') ? 'oe_active' : ''" t-att-data-id="i[0]">
-                        <span class="label"><t t-esc="i[1]"/></span>
+                <t t-foreach="widget.selection.folded" t-as="item">
+                    <li t-att-class="item.id === widget.get('value') ? 'oe_active' : ''" t-att-data-id="item.id">
+                        <span class="label"><t t-esc="item.name"/></span>
                     </li>
                 </t>
             </ul>