Merge lp:~openerp-dev/openobject-client-web/listview_invisible into lp:openobject-client-web/trunk

[Sananaz (Open ERP)]

- Support invisible for List view.
- Example: <field name="journal_id" invisible="1">
- It fixed the Bug #681688.

[lp:~openerp-dev/openobject-client-web/listview_invisible]

4084. By Sananaz (Open ERP) on 2010-12-13

[FIX] Call get_sortable_text directly from the fields, need to remove conflicts from listgroup.mako.

4085. By Sananaz (Open ERP) on 2010-12-13

[FIX] Improve update_param.

4086. By Sananaz (Open ERP) on 2010-12-14

[FIX] Fixed typo 'template', update params for attrs.

4087. By Sananaz (Open ERP) on 2010-12-14

[IMP] Implement attrs for listview.

4088. By Sananaz (Open ERP) on 2010-12-14

[FIX] minor changes.

[Sananaz (Open ERP) (sma-tiny)]

Hello XMO,

Attrs `invisible` for listview will work now.
I request you to please check it and merge with trunk branch.

Thank you.

[Xavier (Open ERP) (xmo-deactivatedaccount)]

Seems to be working fine, I want to check a little something re. 628037 tomorrow morning but I should be able to merge it before morning ends (ours anyway).

=== modified file 'addons/openerp/static/javascript/form_state.js'
--- addons/openerp/static/javascript/form_state.js	2010-12-13 06:36:34 +0000
+++ addons/openerp/static/javascript/form_state.js	2010-12-14 11:26:30 +0000
@@ -93,7 +93,7 @@
 }
 
 function form_hookAttrChange() {
-    var $items = jQuery('td[attrs], div.notebook-page[attrs]');
+    var $items = jQuery('[attrs]');
     var fields = {};
 
     $items.each(function(){
@@ -120,13 +120,13 @@
             var expr_fields = {}; // check if field appears more then once in the expr
 
             if (attrs[attr] == ''){
-                return form_onAttrChange(container, widget, attr, attrs[attr]);
+                return form_onAttrChange(container, widget, attr, attrs[attr], $this);
             }
-            
+
             forEach(attrs[attr], function(n){
 
                 if (typeof(n) == "number") { // {'invisible': [1]}
-                    return form_onAttrChange(container, widget, attr, n);
+                    return form_onAttrChange(container, widget, attr, n, $this);
                 }
 
                 var name = prefix + n[0];
@@ -136,7 +136,7 @@
                     expr_fields[field.id] = 1;
                     // events disconnected during hook_onStateChange,
                     // don't redisconnect or may break onStateChange
-                    var $field = jQuery(field).bind('onAttrChange', partial(form_onAttrChange, container, widget, attr, attrs[attr]));
+                    var $field = jQuery(field).bind('onAttrChange', partial(form_onAttrChange, container, widget, attr, attrs[attr], $this));
                     $field.change(function () {
                         jQuery(this).trigger('onAttrChange');
                     });
@@ -150,12 +150,12 @@
     }
 }
 
-function form_onAttrChange(container, widgetName, attr, expr) {
+function form_onAttrChange(container, widgetName, attr, expr, elem) {
 
     var prefix = widgetName.slice(0, widgetName.lastIndexOf('/') + 1);
     var widget = openobject.dom.get(widgetName);
 
-    var result = form_evalExpr(prefix, expr);
+    var result = form_evalExpr(prefix, expr, elem);
 
     switch (attr) {
         case 'readonly': form_setReadonly(container, widget, result);
@@ -168,26 +168,33 @@
     }
 }
 
-function form_evalExpr(prefix, expr) {
+function form_evalExpr(prefix, expr, ref_elem) {
 
     var stack = [];
     for (var i = 0; i < expr.length; i++) {
 
         var ex = expr[i];
-        var elem = openobject.dom.get(prefix + ex[0]);
-        
+        var elem = null;
+        if (ref_elem.parents('table.grid').length) {
+            var parent = ref_elem.parents('tr.grid-row');
+            var elem = parent.find(idSelector(prefix + ex[0]));
+        }
+        if (!elem || !elem.length) {
+            var elem = jQuery(idSelector(prefix + ex[0]));
+        }
+
         if (ex.length==1) {
             stack.push(ex[0]);
             continue;
         }
         
-        if (!elem) 
+        if (!elem)
             continue;
-        
+
         var op = ex[1];
         var val = ex[2];
-        var elem_value = elem.value || getNodeAttribute(elem, 'value') || elem.innerHTML;
-        
+        var elem_value = elem.attr('value') || elem.text();
+
         switch (op.toLowerCase()) {
             case '=':
             case '==':
 
=== modified file 'addons/openerp/widgets/form/_form.py'
--- addons/openerp/widgets/form/_form.py	2010-12-14 06:01:56 +0000
+++ addons/openerp/widgets/form/_form.py	2010-12-14 11:26:30 +0000
@@ -616,15 +616,19 @@
         self.widget = get_widget(kind)(**attrs)
         self.validator = self.widget.validator
         self.relation = attrs.get('relation') or None
-        if self.readonly:
-            self.editable = self.readonly
+        self.editable = self.readonly
         if 'field_id' not in attrs:
             self.field_id = self.name
 
     def set_value(self, value):
         self.widget.set_value(value)
         self.default = self.widget.default
-
+        
+    def get_sortable_text(self):
+        """ If returns anything other then None, the return value will be
+        used to sort the listgrid. Useful for localized data.
+        """
+        return None
 
 class Button(TinyInputWidget):
 
 
=== modified file 'addons/openerp/widgets/form/templates/hidden.mako'
--- addons/openerp/widgets/form/templates/hidden.mako	2010-10-27 09:36:11 +0000
+++ addons/openerp/widgets/form/templates/hidden.mako	2010-12-14 11:26:30 +0000
@@ -1,2 +1,2 @@
-<input type="hidden" name="${name}" class="${css_class}" readonly="${editable}"
+<input type="hidden" name="${name}" class="${css_class}" value="${value}"
     ${py.attrs(attrs, id=field_id, kind=kind, relation=relation, value=value)}/>
 
=== modified file 'addons/openerp/widgets/listgrid.py'
--- addons/openerp/widgets/listgrid.py	2010-12-09 13:54:43 +0000
+++ addons/openerp/widgets/listgrid.py	2010-12-14 11:26:30 +0000
@@ -203,7 +203,8 @@
         self.headers, self.hiddens, self.data, self.field_total, self.buttons = self.parse(root, fields, data)
 
         for k, v in self.field_total.items():
-            self.field_total[k][1] = self.do_sum(self.data, k)
+            if(len([test[0] for test in self.hiddens if test[0] == k])) <= 0:
+                self.field_total[k][1] = self.do_sum(self.data, k)
 
         self.columns = len(self.headers)
 
@@ -361,7 +362,6 @@
 
                     if invisible:
                         hiddens += [(name, fields[name])]
-#                        continue
 
                     if 'sum' in attrs:
                         field_total[name] = [attrs['sum'], 0.0]
@@ -369,7 +369,11 @@
                     for i, row in enumerate(data):
 
                         row_value = values[i]
-                        cell = CELLTYPES[kind](value=row_value.get(name, False), **fields[name])
+                        if invisible:
+                            cell = form.Hidden(**fields[name])
+                            cell.set_value(row_value.get(name, False))
+                        else:
+                            cell = CELLTYPES[kind](value=row_value.get(name, False), **fields[name])
 
                         for color, expr in self.colors.items():
                             try:
@@ -540,7 +544,7 @@
         return ustr(self.value or '')
 
 class Boolean(Char):
-    templates = "/openerp/widgets/templates/listgrid/boolean.mako"
+    template = "/openerp/widgets/templates/listgrid/boolean.mako"
 
     params = ['val', 'kind']
 
@@ -567,7 +571,7 @@
 
         self.btype = attrs.get('special', attrs.get('type', 'workflow'))
         self.icon = attrs.get('icon')
-
+        self.attrs = attrs.get('attrs', {})
         if self.icon:
             self.icon = icons.get_icon(self.icon)
 
@@ -594,6 +598,10 @@
 
         return dict(id=id, visible=visible)
 
+    def update_params(self, params):
+        super(Button, self).update_params(params)
+        params['attrs']['attrs']=self.attrs
+
 
 CELLTYPES = {
         'char':Char,
 
=== modified file 'addons/openerp/widgets/templates/listgrid/boolean.mako'
--- addons/openerp/widgets/templates/listgrid/boolean.mako	2010-12-02 13:30:21 +0000
+++ addons/openerp/widgets/templates/listgrid/boolean.mako	2010-12-14 11:26:30 +0000
@@ -1,1 +1,1 @@
-<input type="checkbox" kind="${kind}" class="checkbox" readonly="readonly" disabled="disabled" ${py.checker(val)} value="${val}">
+<input type="checkbox" name="${name}" id="${name}" kind="${kind}" class="checkbox" readonly="readonly" disabled="disabled" ${py.checker(val)} value="${val}">
 
=== modified file 'addons/openerp/widgets/templates/listgrid/button.mako'
--- addons/openerp/widgets/templates/listgrid/button.mako	2010-12-02 12:14:31 +0000
+++ addons/openerp/widgets/templates/listgrid/button.mako	2010-12-14 11:26:30 +0000
@@ -1,13 +1,13 @@
 % if visible:
     % if icon:
-        <img height="16" width="16" class="listImage" src="${icon}" title="${help}" context="${ctx}" ${py.attrs(attrs)}
+        <img height="16" width="16" name="${name}" id="${name}" class="listImage" src="${icon}" title="${help}" context="${ctx}" ${py.attrs(attrs)}
             onclick="new ListView('${parent_grid}').onButtonClick('${name}', '${btype}', ${id}, '${confirm}', getNodeAttribute(this, 'context'))"/>
     % else:
-        <a class="button-b" href="javascript: void(0)" ${py.attrs(attrs, context=ctx)} title="${help}"
+        <a class="button-b" name="${name}" id="${name}" href="javascript: void(0)" ${py.attrs(attrs, context=ctx)} title="${help}"
             onclick="new ListView('${parent_grid}').onButtonClick('${name}', '${btype}', ${id}, '${confirm}', getNodeAttribute(this, 'context'))">
             ${string}
         </a>
     % endif
 % elif not icon:
-    <span>&nbsp;</span>
+    <span><img style="display:none" name="${name}" id="${name}" height="16" width="16" class="listImage" src="${icon}" title="${help}" context="${ctx}" ${py.attrs(attrs)} onclick="new ListView('${parent_grid}').onButtonClick('${name}', '${btype}', ${id}, '${confirm}', getNodeAttribute(this, 'context'))"/></span>
 % endif
 
=== modified file 'addons/openerp/widgets/templates/listgrid/char.mako'
--- addons/openerp/widgets/templates/listgrid/char.mako	2010-12-02 12:14:31 +0000
+++ addons/openerp/widgets/templates/listgrid/char.mako	2010-12-14 11:26:30 +0000
@@ -1,1 +1,1 @@
-<span>${text}</span>
+<span name="${name}" id="${name}" value="${value}">${text}</span>
 
=== modified file 'addons/openerp/widgets/templates/listgrid/listgrid.mako'
--- addons/openerp/widgets/templates/listgrid/listgrid.mako	2010-12-09 12:13:54 +0000
+++ addons/openerp/widgets/templates/listgrid/listgrid.mako	2010-12-14 11:26:30 +0000
@@ -67,6 +67,10 @@
             % endif
         </td>
     % endif
+    % for field, field_attrs in hiddens:
+        ${data[field].display()}
+    % endfor
+
     % if editable:
         <td class="grid-cell selector">
             % if not editors: