Merge lp:~openerp-dev/openerp-web/trunk-folded-stage-aja into lp:openerp-web

[ajay javiya (OpenERP)]

Hello,
IMP:
 > In stages, if check box "folded by default" is true, add "..." in form.
FIX:
> In the empty kanban list , quick create doesn't work
Thank You

[lp:~openerp-dev/openerp-web/trunk-folded-stage-aja]

3908. By ajay javiya (OpenERP) on 2014-02-12

[MERGE]: with trunk

3909. By Amit Vora(OpenERP) on 2014-02-12

[IMP] improve code

3910. By Jaydeep Barot(OpenERP) on 2014-02-19

[MERGE] merge with trunk

Unmerged revisions

3910. By Jaydeep Barot(OpenERP) on 2014-02-19

[MERGE] merge with trunk

3909. By Amit Vora(OpenERP) on 2014-02-12

[IMP] improve code

3908. By ajay javiya (OpenERP) on 2014-02-12

[MERGE]: with trunk

3907. By ajay javiya (OpenERP) on 2013-12-20

[FIX]: Empty kanban should allow to add quick create

3906. By ajay javiya (OpenERP) on 2013-12-20

[IMP]:In form view folded stage should folded as kanban

=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2014-01-31 00:52:02 +0000
+++ addons/web/static/src/js/view_form.js	2014-02-19 10:14:51 +0000
@@ -5547,9 +5547,9 @@
         this._super(field_manager, node);
         this.options.clickable = this.options.clickable || (this.node.attrs || {}).clickable || false;
         this.options.visible = this.options.visible || (this.node.attrs || {}).statusbar_visible || false;
+        this.selection = [];
         this.set({value: false});
-        this.selection = {'unfolded': [], 'folded': []};
-        this.set("selection", {'unfolded': [], 'folded': []});
+        this.set("selection", []);
         this.selection_dm = new instance.web.DropMisordered();
         this.dataset = new instance.web.DataSetStatic(this, this.field.relation, this.build_context());
     },
@@ -5579,10 +5579,7 @@
     },
     render_value: function() {
         var self = this;
-        var content = QWeb.render("FieldStatus.content", {
-            'widget': self, 
-            'value_folded': _.find(self.selection.folded, function(i){return i[0] === self.get('value');})
-        });
+        var content = QWeb.render("FieldStatus.content", { 'widget': self });
         self.$el.html(content);
     },
     calc_domain: function() {
@@ -5604,8 +5601,7 @@
      */
     get_selection: function() {
         var self = this;
-        var selection_unfolded = [];
-        var selection_folded = [];
+        var selection = [];
         var fold_field = this.options.fold_field;
 
         var calculation = _.bind(function() {
@@ -5617,11 +5613,7 @@
                             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]);
-                                    }
+                                    selection.push([record[fold_field], record.id, name]);
                                 });
                             });
                         });
@@ -5634,14 +5626,14 @@
                 for(var i=0; i < select.length; i++) {
                     var key = select[i][0];
                     if(key == this.get('value') || !this.options.visible || this.options.visible.indexOf(key) != -1) {
-                        selection_unfolded.push(select[i]);
+                        select[i].unshift(false);
+                        selection.push(select[i]);
                     }
                 }
                 return $.when();
             }
         }, this);
         this.selection_dm.add(calculation()).then(function () {
-            var selection = {'unfolded': selection_unfolded, 'folded': selection_folded};
             if (! _.isEqual(selection, self.get("selection"))) {
                 self.set("selection", selection);
             }
 
=== modified file 'addons/web/static/src/xml/base.xml'
--- addons/web/static/src/xml/base.xml	2014-01-14 13:39:53 +0000
+++ addons/web/static/src/xml/base.xml	2014-02-19 10:14:51 +0000
@@ -1183,25 +1183,12 @@
     <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>
-            <!-- are you mit ? -->
+    <t t-foreach="widget.selection" t-as="i">
+        <li t-att-class="i[1] === widget.get('value') ? 'oe_active' : ''" t-att-data-id="i[1]" t-att-style="i[0] ? 'pointer-events:none' : ''">
+            <span class="label"><t t-esc="i[0] ?  '...' : i[2]"/></span>
             <span class="arrow"><span></span></span>
         </li>
     </t>
-    <t t-if="widget.selection.folded.length">
-        <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>
-                    </li>
-                </t>
-            </ul>
-        </li>
-    </t>
 </t>
 <t t-name="FieldBinaryImage">
     <span class="oe_form_field oe_form_field_image" t-att-style="widget.node.attrs.style">
 
=== modified file 'addons/web_kanban/static/src/css/kanban.css'
--- addons/web_kanban/static/src/css/kanban.css	2014-01-27 17:24:14 +0000
+++ addons/web_kanban/static/src/css/kanban.css	2014-02-19 10:14:51 +0000
@@ -10,6 +10,7 @@
   position: relative;
   max-width: none;
   height: 100%;
+  top: 8%;
 }
 .openerp .oe_kanban_view .oe_view_nocontent .oe_view_nocontent_content {
   margin-left: 90px;
 
=== modified file 'addons/web_kanban/static/src/css/kanban.sass'
--- addons/web_kanban/static/src/css/kanban.sass	2014-01-27 17:24:14 +0000
+++ addons/web_kanban/static/src/css/kanban.sass	2014-02-19 10:14:51 +0000
@@ -57,6 +57,7 @@
         position: relative
         max-width: none
         height: 100%
+        top: 8%
         .oe_view_nocontent_content
             margin-left: 90px
             margin-top: 5px