Merge lp:~openerp-dev/openobject-client-web/6.0-opw-572735-xal into lp:openobject-client-web

[Xavier ALT]

Hi,

This fix the group_by feature within many2one "search popup", making "expand" column and "radio button" visible.

Steps:
- Create a new Sale Order
- In the "Customer" field, click on the "looking glass"
- Within the popup, expand "Group By" and click on "Salesman"

Current: Only group line are shown
Expected: Expand column and selection radio button should been shown.

Cheers,
Xavier

[lp:~openerp-dev/openobject-client-web/6.0-opw-572735-xal]

4812. By Xavier ALT on 2012-06-01

[FIX] web: list view: fix multiple issues when grouping by multiple criteria

=== modified file 'addons/openerp/controllers/listgrid.py'
--- addons/openerp/controllers/listgrid.py	2012-03-06 05:24:05 +0000
+++ addons/openerp/controllers/listgrid.py	2012-06-01 10:41:19 +0000
@@ -183,12 +183,16 @@
         domain = grp_domain
         group_level = ast.literal_eval(group_level)
         groups = ast.literal_eval(groups)
-
-        context = {'group_by_no_leaf': int(no_leaf), 'group_by': group_by, '__domain': domain}
-        args = {'editable': True,
+        # build a new TinyDict to correctly handle _terp_* params
+        params = TinyDict(**kw)
+        editable = params.editable
+        selectable = params.selectable or 2
+        context = params.context or {}
+        context.update({'group_by_no_leaf': int(no_leaf), 'group_by': group_by, '__domain': domain})
+        args = {'editable': editable,
                 'view_mode': ['tree', 'form', 'calendar', 'graph'],
                 'nolinks': 1, 'group_by_ctx': group_by,
-                'selectable': 2,
+                'selectable': selectable,
                 'multiple_group_by': True,
                 'sort_key': kw.get('sort_key'),
                 'sort_order': kw.get('sort_order')}

=== modified file 'addons/openerp/static/javascript/listgrid.js'
--- addons/openerp/static/javascript/listgrid.js	2012-01-20 10:03:09 +0000
+++ addons/openerp/static/javascript/listgrid.js	2012-06-01 10:41:19 +0000
@@ -248,6 +248,12 @@
             jQuery('#' + record + '[parent_grp_id="' + id + '"]').toggle();
         } else {
             if (jQuery(group).hasClass('group-expand')) {
+                // get listview selectable value, so we know if we are in
+                // simple or multiple selection mode
+                var selectable = openobject.dom.get('_terp_selectable');
+                if (selectable) {
+                    selectable = selectable.value
+                }
                 jQuery.ajax({
                     url: '/openerp/listgrid/multiple_groupby',
                     type: 'POST',
@@ -260,7 +266,10 @@
                             'groups': total_groups,
                             'no_leaf': no_leaf,
                             'sort_order': sort_order,
-                            'sort_key': sort_key},
+                            'sort_key': sort_key,
+                            '_terp_editable': openobject.dom.get('_terp_editable').value,
+                            '_terp_selectable': selectable,
+                            '_terp_context': openobject.dom.get('_terp_context').value},
                     dataType: 'html',
                     success: function(xmlHttp) {
                         $group_record.after(xmlHttp);

=== modified file 'addons/openerp/widgets/templates/listgrid/listgroup.mako'
--- addons/openerp/widgets/templates/listgrid/listgroup.mako	2011-08-30 11:41:21 +0000
+++ addons/openerp/widgets/templates/listgrid/listgroup.mako	2012-06-01 10:41:19 +0000
@@ -34,7 +34,7 @@
             <table id="${name}_grid" class="grid" width="100%" cellspacing="0" cellpadding="0">
                 <thead>
                     <tr class="grid-header">
-                        % if editable:
+                        % if editable or selectable:
                             <th class="grid-cell selector"><div style="width: 0;"></div></th>
                         % endif
                         % for (field, field_attrs) in headers:
@@ -53,7 +53,7 @@
                 <tbody>
 					% for j, grp_row in enumerate(grp_records):
 					<tr class="grid-row-group" grp_by_id="${grp_row.get('group_by_id')}" records="${grp_row.get('groups_id')}" style="cursor: pointer; " ch_records="${map(lambda x: x['id'], grp_row['child_rec'])}" grp_domain="${grp_row['__domain']}" grp_context="${grp_row['__context']['group_by']}">
-                        % if editable:
+                        % if editable or selectable:
 
                             % if len(group_by_ctx) == 1 and group_by_no_leaf:
                                 <td class="grid-cell"></td>
@@ -111,6 +111,20 @@
                                 <img src="/openerp/static/images/iconset-b-edit.gif" class="listImage" border="0"
                                      title="${_('Edit')}" onclick="editRecord(${ch.get('id')}, '${source}')"/>
                             </td>
+                        % elif selector:
+                            <td class="grid-cell selector">
+                                % if not m2m:
+                                <%
+                                    selector_click = "new ListView('%s').onBooleanClicked(!this.checked, '%s');" % (name, ch.get('id'))
+                                    if selector == "radio":
+                                        selector_click += " do_select();"
+                                %>
+                                <input type="${selector}" class="${selector} grid-record-selector"
+                                    id="${name}/${ch.get('id')}" name="${(checkbox_name or None) and name}"
+                                    value="${ch.get('id')}"
+                                    onclick="${selector_click}"/>
+                                % endif
+                            </td>
                         % endif
                         % for i, (field, field_attrs) in enumerate(headers):
                             % if field != 'button':
@@ -138,7 +152,7 @@
 
                     % for i in range(0, min_rows - len(grp_records)):
                     <tr class="grid-row-group">
-                        % if editable:
+                        % if editable or selectable:
                         <td style="text-align: center" class="grid-cell selector">&nbsp;</td>
                         % endif
                         % for i, (field, field_attrs) in enumerate(headers):
@@ -155,7 +169,7 @@
                 % if field_total:
                     <tfoot>
                         <tr class="field_sum">
-                            % if editable:
+                            % if editable or selectable:
                                 <td width="1%" class="grid-cell">&nbsp;</td>
                             % endif
                             % for i, (field, field_attrs) in enumerate(headers):
@@ -209,7 +223,7 @@
                     });
                 </script>
             % endif
-            % if editable:
+            % if editable or selectable:
                 <script type="text/javascript">
                     jQuery('table[id=${name}_grid] tr.grid-row').click(function(event) {
                         var $this = jQuery(this);

=== modified file 'addons/openerp/widgets/templates/listgrid/multiple_group.mako'
--- addons/openerp/widgets/templates/listgrid/multiple_group.mako	2011-12-09 06:23:46 +0000
+++ addons/openerp/widgets/templates/listgrid/multiple_group.mako	2012-06-01 10:41:19 +0000
@@ -7,7 +7,7 @@
         records="${grp_row['groups_id']}" style="cursor: pointer; background-color: ${background};"
         ch_records="${map(lambda x: x['id'],grp_row['child_rec'])}" grp_domain="${grp_row['__domain']}"
         grp_context="${grp_row['__context']['group_by']}">
-        % if editable:
+        % if editable or selectable:
             <td class="grid-cell" ></td>
         % endif
         % for i, (field, field_attrs) in enumerate(headers):
@@ -68,6 +68,20 @@
                     <img src="/openerp/static/images/listgrid/edit_inline.gif" class="listImage" border="0"
                          title="${_('Edit')}" onclick="editRecord(${ch.get('id')}, '${source}')"/>
                 </td>
+            % elif selectable:
+                <td class="grid-cell selector">
+                    % if not m2m:
+                    <%
+                        selector_click = "new ListView('%s').onBooleanClicked(!this.checked, '%s');" % (name, ch.get('id'))
+                        if selector == "radio":
+                            selector_click += " do_select();"
+                    %>
+                    <input type="${selector}" class="${selector} grid-record-selector"
+                        id="${name}/${ch.get('id')}" name="${(checkbox_name or None) and name}"
+                        value="${ch.get('id')}"
+                        onclick="${selector_click}"/>
+                    % endif
+                </td>
             % endif
             % for i, (field, field_attrs) in enumerate(headers):
                 % if field != 'button':