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

[Xavier ALT]

Hi,

When clicking on a button within a one2many window, web client force data of that record to be rewritten. This can cause permission errors.

The one2many save() has been modified to support filtering only modified datas (like it's done on form save()).

Regards,
Xavier

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

4889. By Xavier ALT on 2012-10-29

[FIX] OPW 580592: web: when compararing current and original compare, make sure both arguments are unicode

4890. By Anaël Closson (openerp) on 2013-03-12

[FIX] OPW 587377 ie stop listening clicks when spam clicking on buttons on a view with m2o

Unmerged revisions

4890. By Anaël Closson (openerp) on 2013-03-12

[FIX] OPW 587377 ie stop listening clicks when spam clicking on buttons on a view with m2o

4889. By Xavier ALT on 2012-10-29

[FIX] OPW 580592: web: when compararing current and original compare, make sure both arguments are unicode

4888. By Xavier ALT on 2012-10-15

[FIX] OPW 580592: web: one2many: when saving one2many data filter data that has not been modified

  - This is necessary when user has no 'write' access on the one2many object,
    and user clic on a button. If user didn't modify the record - write() call
    is not necessary.

=== modified file 'addons/openerp/controllers/form.py'
--- addons/openerp/controllers/form.py	2012-11-05 17:35:08 +0000
+++ addons/openerp/controllers/form.py	2013-03-12 16:01:23 +0000
@@ -421,7 +421,7 @@
                     for field, original_value in original_data.iteritems():
                         if isinstance(original_value, tuple):
                             original_data[field] = original_value[0]
-                        if field in data and data[field] != original_data[field]:
+                        if field in data and ustr(data[field]) != ustr(original_data[field]):
                             #When field is many2many at that time following code will be applied
                             if isinstance(data[field], list) and isinstance(data[field][0][2], list):
                                 if sorted(data[field][0][2]) != sorted(original_data[field]):

=== modified file 'addons/openerp/controllers/openo2m.py'
--- addons/openerp/controllers/openo2m.py	2012-09-13 15:19:58 +0000
+++ addons/openerp/controllers/openo2m.py	2013-03-12 16:01:23 +0000
@@ -113,6 +113,7 @@
         params, data = TinyDict.split(kw)
         params.editable = True
 
+        o2m_proxy = rpc.RPCProxy(params.o2m_model)
         proxy = rpc.RPCProxy(params.parent_model)
 
         pprefix = '.'.join(params.o2m.split('/')[:-1])
@@ -120,11 +121,42 @@
         if pprefix:
             data = eval(pprefix, TinyDict(**data)).make_dict()
 
+        fld = params.o2m.split('/')[-1]
+
         ctx = context_with_concurrency_info(rpc.session.context, params.concurrency_info)
         ctx.update(params.parent_context or {})
         ctx.update(params.o2m_context or {})
 
-        id = proxy.write([params.parent_id], data, ctx)
+        ## Before writing, filter data that has not been modified
+        if isinstance(data, dict) and fld in data:
+            fld_data = []
+            fld_ctx = dict((params.o2mcontext or {}), **rpc.session.context)
+            for (op, _id, values) in data[fld]:
+                modified = {}
+                if _id and op == 1: # we're updating that record
+                    original_data = o2m_proxy.read(_id, values.keys(), fld_ctx)
+
+                    if original_data and isinstance(original_data, dict):
+                        for field, original_value in original_data.iteritems():
+                            if isinstance(original_value, tuple):
+                                original_data[field] = original_value[0]
+                            if field in values and ustr(values[field]) != ustr(original_data[field]):
+                                #When field is many2many at that time following code will be applied
+                                if isinstance(values[field], list) and isinstance(values[field][0][2], list):
+                                    if sorted(values[field][0][2]) != sorted(original_data[field]):
+                                        modified[field] = values[field]
+                                else:
+                                    modified[field] = values[field]
+                if modified:
+                    fld_data.append((op, _id, modified))
+            # update 'fld' in data, or remove it if there is nothing to be written
+            if fld_data:
+                data[fld] = fld_data
+            else:
+                data.pop(fld, None)
+
+        if data:
+            id = proxy.write([params.parent_id], data, ctx)
 
         prefix = params.o2m
         current = params.chain_get(prefix)
@@ -132,7 +164,6 @@
         params.load_counter = 1
 
         ids = current.ids
-        fld = params.o2m.split('/')[-1]
         all_ids = proxy.read([params.parent_id], [fld])[0][fld]
         new_ids = [i for i in all_ids if i not in ids]
 

=== modified file 'addons/openerp/static/javascript/m2o.js'
--- addons/openerp/static/javascript/m2o.js	2012-08-21 17:19:50 +0000
+++ addons/openerp/static/javascript/m2o.js	2013-03-12 16:01:23 +0000
@@ -31,7 +31,6 @@
     }
 
     this.__init__(name);
-    self = this;
 };
 
 ManyToOne.prototype.__init__ = function(name) {
@@ -277,11 +276,11 @@
         if(evt.target.tagName.toLowerCase() == 'input') {
             var w;
             if(jQuery('#search_filter_data').is(':visible')) {
-                w = jQuery(evt.currentTarget).width()
+                w = jQuery(evt.currentTarget).width();
             } else {
                 w = jQuery(evt.currentTarget).width() + jQuery(idSelector(this.name + '_select')).width();
             }
-            jQuery('div.autoTextResults[id$="' + this.name + '"]').width(w)
+            jQuery('div.autoTextResults[id$="' + this.name + '"]').width(w);
         }
     }
 
@@ -473,7 +472,7 @@
             context: this.get_context()
         }).addCallback(function(obj) {
             self.eval_domain = obj.domain;
-            self.eval_context = obj.context
+            self.eval_context = obj.context;
 
             jQuery.getJSON('/openerp/search/get_matched', {
                 text: val,
@@ -542,7 +541,7 @@
         return true;
     }
     catch(e) {
-        error_display(_('error in display::') + e)
+        error_display(_('error in display::') + e);
     }
 };
 
@@ -594,7 +593,7 @@
     function open($this, options) {
         var url;
         if(options.record) {
-            url = '/openerp/openm2o/edit'
+            url = '/openerp/openm2o/edit';
         } else {
             url = '/openerp/search/new';
         }