Merge lp:~fabien-morin/unifield-web/perf_improvement_web into lp:unifield-web

[jftempo]

[lp:~fabien-morin/unifield-web/perf_improvement_web]

4810. By Fabien MORIN on 2016-08-26

US-1246 [MERGE] with latest trunk

Unmerged revisions

4810. By Fabien MORIN on 2016-08-26

US-1246 [MERGE] with latest trunk

=== modified file 'addons/openerp/controllers/attachment.py'
--- addons/openerp/controllers/attachment.py	2016-05-02 12:04:12 +0000
+++ addons/openerp/controllers/attachment.py	2016-08-26 09:28:44 +0000
@@ -56,7 +56,8 @@
     @expose(content_type="application/octet-stream")
     def get(self, record=False):
         record = int(record)
-        attachment = rpc.RPCProxy('ir.attachment').read(record, [], rpc.session.context)
+        attachment = rpc.RPCProxy('ir.attachment').read(record, ['type',
+        'datas', 'url', 'name'], rpc.session.context)
 
         if attachment['type'] == 'binary':
             cherrypy.response.headers["Content-Disposition"] = 'attachment; filename="%s"' % attachment['name']

=== modified file 'addons/openerp/controllers/modules.py'
--- addons/openerp/controllers/modules.py	2011-01-18 11:35:00 +0000
+++ addons/openerp/controllers/modules.py	2016-08-26 09:28:44 +0000
@@ -14,19 +14,6 @@
 class ModuleForm(form.Form):
     _cp_path = "/openerp/modules"
 
-    def has_new_modules(self):
-        """ Returns whether there are new web modules available for download
-        (brand new or updates)
-
-        :rtype bool:
-        """
-        return bool([
-            name for (name, version) in rpc.RPCProxy('ir.module.module').list_web()
-            if (not addons.exists(name)
-                or version > addons.get_info(name).get('version', '0')
-                or name not in addons._loaded[cherrypy.session.get('db')])
-        ])
-
     def get_new_modules(self):
         if not addons.writeable: return []
         modules = rpc.RPCProxy('ir.module.module')

=== modified file 'addons/openerp/controllers/preferences.py'
--- addons/openerp/controllers/preferences.py	2016-07-25 13:13:38 +0000
+++ addons/openerp/controllers/preferences.py	2016-08-26 09:28:44 +0000
@@ -52,7 +52,8 @@
         proxy = rpc.RPCProxy('res.users')
         action_id = proxy.action_get({})
 
-        action = rpc.RPCProxy('ir.actions.act_window').read([action_id], False, rpc.session.context)[0]
+        action = rpc.RPCProxy('ir.actions.act_window').read([action_id],
+                ['views', 'view_id'], rpc.session.context)[0]
 
         view_ids=[]
         if action.get('views', []):

=== modified file 'addons/openerp/controllers/viewed.py'
--- addons/openerp/controllers/viewed.py	2011-01-18 20:49:43 +0000
+++ addons/openerp/controllers/viewed.py	2016-08-26 09:28:44 +0000
@@ -289,7 +289,7 @@
             return doc_src.toxml().replace('\t', '')
 
         views = rpc.RPCProxy('ir.ui.view')
-        res = views.read([view_id])[0]
+        res = views.read([view_id], ['arch', 'model', 'type'])[0]
 
         def _inherit_apply_rec(result, inherit_id):
             # get all views which inherit from (ie modify) this view

=== modified file 'addons/openerp/controllers/widgets.py'
--- addons/openerp/controllers/widgets.py	2010-12-02 12:58:19 +0000
+++ addons/openerp/controllers/widgets.py	2016-08-26 09:28:44 +0000
@@ -44,7 +44,7 @@
                  ('user_id', '=', False)],
                 0, 0, 0, ctx)
         return [
-            dict(widgets.read([wid['widget_id'][0]], [], ctx)[0],
+            dict(widgets.read([wid['widget_id'][0]], ['content', 'id', 'title'], ctx)[0],
                  user_widget_id=wid['id'],
                  # NULL user_id = global = non-removable
                  removable=bool(wid['user_id']))

=== modified file 'addons/openerp/static/javascript/form_state.js'
--- addons/openerp/static/javascript/form_state.js	2015-09-16 09:02:05 +0000
+++ addons/openerp/static/javascript/form_state.js	2016-08-26 09:28:44 +0000
@@ -155,18 +155,19 @@
         } catch(e){
             return;
         }
+        var cache_values = {};
 
         for (var attr in attrs) {
             var expr_fields = {}; // check if field appears more then once in the expr
 
             if (attrs[attr] == ''){
-                return form_onAttrChange(container, widget, attr, attrs[attr], $this);
+                return form_onAttrChange(container, widget, attr, attrs[attr], $this, cache_values);
             }
 
             forEach(attrs[attr], function(n){
 
                 if (typeof(n) == "number") { // {'invisible': [1]}
-                    return form_onAttrChange(container, widget, attr, n, $this);
+                    return form_onAttrChange(container, widget, attr, n, $this, cache_values);
                 }
 
                 var name = prefix + n[0];
@@ -176,8 +177,8 @@
                     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], $this));
-                    $field.change(partial(form_onAttrChange, container, widget, attr, attrs[attr], $this));
+                    var $field = jQuery(field).bind('onAttrChange', partial(form_onAttrChange, container, widget, attr, attrs[attr], $this, {}));
+                    $field.change(partial(form_onAttrChange, container, widget, attr, attrs[attr], $this, {}));
                 }
             });
         }
@@ -209,7 +210,11 @@
             return;
         }
 
-        var row_is_editable = $this.parents('tr.grid-row').is('.editors')
+        // check if an editor exists
+        var editor_exists = $(".editors").length;
+        var cache_values = {};
+
+        var row_is_editable = editor_exists && $this.parents('tr.grid-row').is('.editors');
         for (var attr in attrs) {
             if (!row_is_editable && attr != 'invisible') {
                 // when row is not in editable mode we only care about invisible attributes
@@ -217,30 +222,31 @@
                 continue;
             }
             if (attrs[attr] == '') {
-                return form_onAttrChange(container, widget, attr, attrs[attr], $this);
+                return form_onAttrChange(container, widget, attr, attrs[attr], $this, cache_values);
             }
             forEach(attrs[attr], function(n) {
                 if (typeof(n) == "number") { // {'invisible': [1]}
-                    return form_onAttrChange(container, widget, attr, n, $this);
+                    return form_onAttrChange(container, widget, attr, n, $this, cache_values);
                 }
                 var name = prefix + n[0];
                 var field = openobject.dom.get(name);
                 if (row_is_editable) {
-                    var $field = jQuery(field).bind('onAttrChange', partial(form_onAttrChange, container, widget, attr, attrs[attr], $this));
-                    $field.change(partial(form_onAttrChange, container, widget, attr, attrs[attr], $this));
+                    var $field = jQuery(field).bind('onAttrChange', partial(form_onAttrChange, container, widget, attr, attrs[attr], $this, {}));
+                    $field.change(partial(form_onAttrChange, container, widget, attr, attrs[attr], $this, {}));
                 }
-                return form_onAttrChange(container, widget, attr, attrs[attr], $this);
+                return form_onAttrChange(container, widget, attr, attrs[attr], $this, cache_values);
             });
         }
     });
 }
 
-function form_onAttrChange(container, widgetName, attr, expr, elem) {
+function form_onAttrChange(container, widgetName, attr, expr, elem, cache_values) {
+    var cache_values = cache_values || {};
 
     var prefix = widgetName.slice(0, widgetName.lastIndexOf('/') + 1);
     var widget = openobject.dom.get(widgetName) || elem;
 
-    var result = form_evalExpr(prefix, expr, elem);
+    var result = form_evalExpr(prefix, expr, elem, cache_values);
 
     switch (attr) {
         case 'readonly':
@@ -260,115 +266,181 @@
     }
 }
 
-function form_find_field_in_context(prefix, field, ref_elem) {
+function ret_cache_if_available(cache, key, func_eval)
+{
+    if(cache[key] == undefined){
+        val = func_eval()
+        cache[key] = val;
+        return val;
+    }else{
+        return cache[key];
+    }
+}
+
+function form_find_field_in_context(prefix, field, ref_elem, cache_values) {
     // try to find field in the context of reference element (ref_elem)
     var elem = null;
-    if (ref_elem.parents('table.grid').length) {
-        var parent = ref_elem.parents('tr.grid-row');
-        elem = parent.find(idSelector(prefix + field));
-
-        if (!elem || !elem.length) {
-            var parent_selector = '[name='+prefix + field +']';
-            elem = parent.find(parent_selector);
-        }
-
-        if (!elem || !elem.length) {
-            // try getting with _terp_listfields/TABLE_ID/FIELD_NAME
-            var parent_table_id = ref_elem.parents('table.grid')[0].id;
-            if (parent_table_id && parent_table_id.match('_grid$')) {
-                parent_table_id = parent_table_id.slice(0, parent_table_id.length - 5);
-            }
-            if (parent_table_id == '_terp_list') {
-                // in case list name if '_terp_list' this means we're not inside a o2m/m2m fields,
-                // and we no need need to prefix with parent_table_id name
-                parent_table_id = ''
-            } else {
-                parent_table_id = parent_table_id + '/'
-            }
-            var parent_relative_fieldname = '[name=_terp_listfields/' + parent_table_id + prefix + field + ']';
-            elem = parent.find(parent_relative_fieldname);
-        }
-    }
-    if (!elem || !elem.length) {
-        elem = jQuery(idSelector(prefix + field));
-    }
-    return elem;
+
+    var key_cache = 'bigcache_' + prefix + '_' + field;
+
+    return ret_cache_if_available(cache_values, key_cache, function(){
+
+        var parents_grid = ret_cache_if_available(cache_values, 'closest_table.grid', function(){
+            return ref_elem.closest('table.grid');
+        });
+
+        if (parents_grid.length) {
+
+            var parent = ret_cache_if_available(cache_values, 'tr.grid-row', function(){
+                return ref_elem.closest('tr.grid-row');
+            });
+
+            elem = parent.find(idSelector(prefix + field));
+
+            if (!elem || !elem.length) {
+                var parent_selector = '[name='+prefix + field +']';
+                elem = parent.find(parent_selector);
+            }
+
+            if (!elem || !elem.length) {
+                // try getting with _terp_listfields/TABLE_ID/FIELD_NAME
+                var parent_table_id = parents_grid[0].id;
+                if (parent_table_id && parent_table_id.match('_grid$')) {
+                    parent_table_id = parent_table_id.slice(0, parent_table_id.length - 5);
+                }
+                if (parent_table_id == '_terp_list') {
+                    // in case list name if '_terp_list' this means we're not inside a o2m/m2m fields,
+                    // and we no need need to prefix with parent_table_id name
+                    parent_table_id = ''
+                } else {
+                    parent_table_id = parent_table_id + '/'
+                }
+                var parent_relative_fieldname = '[name=_terp_listfields/' + parent_table_id + prefix + field + ']';
+                elem = parent.find(parent_relative_fieldname);
+            }
+        }
+        if (!elem || !elem.length) {
+            elem = jQuery(idSelector(prefix + field));
+        }
+        cache_values[key_cache] = elem;
+        return elem;
+    });
 }
 
-function form_evalExpr(prefix, expr, ref_elem) {
-
+
+function form_evalExpr(prefix, expr, ref_elem, cache_values) {
+
+    // the stack contains future that can be evaluated when it's required
     var stack = [];
     for (var i = 0; i < expr.length; i++) {
 
         var ex = expr[i];
         var op = ex[1];
-        var elem = form_find_field_in_context(prefix, ex[0], ref_elem);
+
+        // it's an operator, we don't need to find its value in the page
         if (ex.length==1) {
-            stack.push(ex[0]);
+
+            function val_gen(ret_val){
+                return function(){
+                    return ret_val;
+                }
+            }
+
+
+            stack.push(val_gen(ex[0]));
             continue;
         }
-        if (!elem || !elem.length) {
-            continue
-        }
-        var val = ex[2];
-
-        var elem_value;
-        if(elem.is(':input')) {
-            elem_value = elem.val();
-        } else {
-            elem_value = elem.attr('value') || elem.text();
-        }
-
-        switch (op.toLowerCase()) {
-            case '=':
-            case '==':
-                stack.push(elem_value == val);
-                break;
-            case '!=':
-            case '<>':
-                stack.push(elem_value != val);
-                break;
-            case '<':
-                stack.push(elem_value < val);
-                break;
-            case '>':
-                stack.push(elem_value > val);
-                break;
-            case '<=':
-                stack.push(elem_value <= val);
-                break;
-            case '>=':
-                stack.push(elem_value >= val);
-                break;
-            case 'in':
-                stack.push(MochiKit.Base.findIdentical(val, elem_value) > -1);
-                break;
-            case 'not in':
-                stack.push(MochiKit.Base.findIdentical(val, elem_value) == -1);
-                break;
-        }
-    }
-    stack = eval_stack(stack, 0);
-    
-    // shouldn't find any `false` left at this point
-    return stack.indexOf(false) == -1;
+
+        // create a future in order to evaluate it only if required
+        function fetch_value(_op, _prefix, ex_0, ex_2, ref_elem){
+
+            return function(){
+                var elem = form_find_field_in_context(_prefix, ex_0, ref_elem, cache_values);
+
+                if (!elem || !elem.length) {
+                    return null;
+                }
+                var val = ex_2;
+
+                var elem_value;
+                if(elem.is(':input')) {
+                    elem_value = elem.val();
+                } else {
+                    elem_value = elem.attr('value') || elem.text();
+                }
+
+                switch (_op.toLowerCase()) {
+                    case '=':
+                    case '==':
+                        return elem_value == val;
+                    case '!=':
+                    case '<>':
+                        return elem_value != val;
+                    case '<':
+                        return elem_value < val;
+                    case '>':
+                        return elem_value > val;
+                    case '<=':
+                        return elem_value <= val;
+                    case '>=':
+                        return elem_value >= val;
+                    case 'in':
+                        return MochiKit.Base.findIdentical(val, elem_value) > -1;
+                    case 'not in':
+                        return MochiKit.Base.findIdentical(val, elem_value) == -1;
+                }
+
+                return null;
+            };
+        };
+
+        stack.push(fetch_value(op, prefix, ex[0], ex[2], ref_elem));
+    }
+
+    ret = true;
+    position = 0;
+
+    while(ret && position < stack.length){
+        result = eval_stackNew(stack, position, false)
+
+        ret = result.value;
+        position = result.next;
+    }
+
+    return ret;
 }
 
-function eval_stack(stack, i) {
-    for (var j=i; j<stack.length; j++) {
-        if (stack[j] == '|') {
-            stack = eval_stack(stack,j+1);
-            stack = eval_stack(stack,j+2);
-            stack.splice(j, 3, stack[j+1] || stack[j+2]);
-        } else if (stack[j] == '&') {
-            stack = eval_stack(stack,j+1);
-            stack = eval_stack(stack,j+2);
-            stack.splice(j, 3, stack[j+1] && stack[j+2]);
-        } else {
-            return stack;
+function eval_stackNew(stack, i, fuzzy) {
+
+    if(stack.length <= i){
+        return {value: true, next: i+1};
+    }else{
+        value = stack[i]()
+
+        if(value === null){
+            return eval_stackNew(stack, i+1, fuzzy);
+        }else if(value === false || value === true){
+            return {value: value, next: i+1};
+        }else if(value === '|'){
+            var val1 = eval_stackNew(stack, i+1, false)
+            var val2 = eval_stackNew(stack, val1.next, false)
+            return {value: val1.value || val2.value, next: val2.next};
+        }else if(value === '&'){
+        
+            if(fuzzy){
+                var val1 = eval_stackNew(stack, i+1, true)
+                if(!val1.value)
+                    return {value: false, next: undefined};
+                else
+                    return {value: eval_stackNew(stack, val1.next, true), next: undefined};
+            }else{
+                var val1 = eval_stackNew(stack, i+1, false)
+                var val2 = eval_stackNew(stack, val1.next, false)
+                return {value: val1.value && val2.value, next: val2.next};
+            }
+
         }
     }
-    return stack
 }
 
 function form_setReadonly(container, fieldName, readonly) {

=== modified file 'addons/openerp/utils/utils.py'
--- addons/openerp/utils/utils.py	2015-12-02 09:26:54 +0000
+++ addons/openerp/utils/utils.py	2016-08-26 09:28:44 +0000
@@ -331,8 +331,8 @@
 
                         value = []
                         for relation_record in relation_objects:
-                            id = relation_record.pop('id')
-                            value.append(OneToMany.update(id, relation_record))
+                            obj_id = relation_record.pop('id')
+                            value.append(OneToMany.update(obj_id, relation_record))
                     else:
                         value = []
                 except:

=== modified file 'addons/openerp/widgets/form/_action.py'
--- addons/openerp/widgets/form/_action.py	2011-01-17 11:57:11 +0000
+++ addons/openerp/widgets/form/_action.py	2016-08-26 09:28:44 +0000
@@ -46,7 +46,9 @@
             raise _('Action not found!')
 
         _type=res[0]['type']
-        self.action = rpc.session.execute('object', 'execute', _type, 'read', [self.act_id], False, rpc.session.context)[0]
+        self.action = rpc.session.execute('object', 'execute', _type, 'read',
+                [self.act_id], ['view_mode', 'type', 'domain', 'context',
+                    'views', 'view_type', 'res_model'], rpc.session.context)[0]
 
         if 'view_mode' in attrs:
             self.action['view_mode'] = attrs['view_mode']

=== modified file 'addons/openerp/widgets/form/_form.py'
--- addons/openerp/widgets/form/_form.py	2016-07-19 15:19:24 +0000
+++ addons/openerp/widgets/form/_form.py	2016-08-26 09:28:44 +0000
@@ -517,7 +517,7 @@
         self.operator = attrs.get('operator', '=')
         self.search_context = attrs.get('context', {})
         #Below mentioned process should be followed for m2o as selection and for boolean field on search panel
-        if not self.options and attrs.get('relation') and attrs.get('widget') == 'selection':
+        if not self.options and attrs.get('relation') and attrs.get('widget') == 'selection' and not attrs.get('get_selection'):
             proxy = rpc.RPCProxy(attrs['relation'])
             try:
                 domain = attrs.get('domain', [])

=== modified file 'addons/view_diagram/controllers/process.py'
--- addons/view_diagram/controllers/process.py	2011-02-17 13:59:18 +0000
+++ addons/view_diagram/controllers/process.py	2016-08-26 09:28:44 +0000
@@ -46,7 +46,8 @@
         help = _('Help: Not Defined')
         help_ids = rpc.session.execute('object', 'execute', 'ir.actions.act_window', 'search', [('res_model','=',res_model)])
         for help_id in help_ids:
-            field = rpc.session.execute('object', 'execute', 'ir.actions.act_window', 'read', help_id)
+            field = rpc.session.execute('object', 'execute',
+                    'ir.actions.act_window', 'read', help_id, ['help', 'name'])
             if field['help'] and (field['name'] == title):
                 help = field['help']
 

=== modified file 'openobject/controllers/_root.py'
--- openobject/controllers/_root.py	2011-05-10 13:22:29 +0000
+++ openobject/controllers/_root.py	2016-08-26 09:28:44 +0000
@@ -62,19 +62,6 @@
             # doesn't restart due to downloading new add-ons or refreshing
             # existing ones
             cherrypy.engine.autoreload.unsubscribe()
-        try:
-            obj = pooler.get_pool().get_controller("/openerp/modules")
-            if not obj:
-                raise RuntimeError(
-                    "Cannot find controller for /openerp/modules")
-            if obj.has_new_modules():
-                pooler.restart_pool()
-        except AuthenticationError:
-            pass
-
-        if autoreloader_enabled:
-            # re-enable auto-reloading if it was enabled before
-            cherrypy.engine.autoreload.subscribe()
 
         request = cherrypy.request
         self.clean_headers_params(request)