Merge lp:~unifield-team/unifield-web/web-uf-1718 into lp:unifield-web

[jftempo]

=== modified file 'addons/openerp/controllers/templates/tree.mako'
--- addons/openerp/controllers/templates/tree.mako	2013-02-07 15:11:59 +0000
+++ addons/openerp/controllers/templates/tree.mako	2014-01-13 13:50:54 +0000
@@ -44,7 +44,8 @@
                             % endfor
                         </select>
                         % if tree.expand_button:
-                            <button onclick="TREEVIEW.current.expand_all(); return false" title="${_('Expand all tree elements.')}">${_('Expand all')}</button>
+                            <button onclick="TREEVIEW.current.expand_all(); return false" title="${_('Expand all tree elements.')}" id="expand_button">${_('Expand all')}</button>
+                            <button onclick="TREEVIEW.current.collapse_all(); return false" title="${_('Collapse all tree elements.')}" style="display: none;" id="collapse_button">${_('Collapse all')}</button>
                         % endif
                     </div>
                     % endif
 
=== modified file 'addons/openerp/controllers/tree.py'
--- addons/openerp/controllers/tree.py	2012-11-21 11:18:08 +0000
+++ addons/openerp/controllers/tree.py	2014-01-13 13:50:54 +0000
@@ -145,7 +145,7 @@
 
     @expose('json')
     def data(self, ids, model, fields, field_parent=None, icon_name=None,
-             domain=[], context={}, sort_by=None, sort_order="asc", fields_info=None, colors={}):
+             domain=[], context={}, sort_by=None, sort_order="asc", fields_info=None, colors={}, nolink=False):
         
         if ids == 'None' or ids == '':
             ids = []
@@ -226,7 +226,8 @@
                 'children': [],
                 'items': item
             }
-
+            if nolink=='1':
+                record['action'] = None
             if icon_name and item.get(icon_name):
                 icon = item.pop(icon_name)
                 record['icon'] = icons.get_icon(icon)
 
=== modified file 'addons/openerp/static/javascript/treegrid.js'
--- addons/openerp/static/javascript/treegrid.js	2012-03-09 09:29:10 +0000
+++ addons/openerp/static/javascript/treegrid.js	2014-01-13 13:50:54 +0000
@@ -221,9 +221,18 @@
     },
     
     expand_all: function() {
-    	this.options.expandall = true;
-    	this.render();
-    }
+        this.options.expandall = true;
+        this.render();
+        $('#collapse_button').toggle()
+        $('#expand_button').toggle()
+    },
+
+    collapse_all: function() {
+        this.options.expandall = false;
+        this.render();
+        $('#expand_button').toggle()
+        $('#collapse_button').toggle()
+    },
     
 };
 
 
=== modified file 'addons/openerp/widgets/tree_view.py'
--- addons/openerp/widgets/tree_view.py	2012-05-22 12:06:35 +0000
+++ addons/openerp/widgets/tree_view.py	2014-01-13 13:50:54 +0000
@@ -69,7 +69,7 @@
         self.toolbar = attrs.get('toolbar', False)
         # Set the button to be optional
         self.expand_button = attrs.get('expand_button', False)
-
+        nolink = attrs.get('nolink', '0')
         ids = []
         id = res_id
         
@@ -104,7 +104,8 @@
                                       field_parent=self.field_parent,
                                       onselection="onSelection",
                                       fields_info=fields_info,
-                                      colors=colors)
+                                      colors=colors,
+                                      nolink=nolink)
         self.id = id
         self.ids = ids