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

[Xavier ALT]

Hi,

This fix Popup window stacking. Currently, all popups are stacked on the root window. If we open a many2one field, then open sub-records (many2many, one2many), those child popup should be stacked on the "many2one" popup window, otherwise we're getting wrong context and view simply crash.

Regards,
Xavier

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

4852. By Xavier ALT on 2012-08-13

[MERGE] web: correctly get if view is editable when _terp_editable is prefixed by o2m widget name

4853. By Xavier ALT on 2012-08-14

[FIX] web: one2many field: correctly get widget by prefix for multiple one2many popup stack

4854. By Xavier ALT on 2012-08-14

[FIX] web: openerp.ui.TextArea, correctly escape textarea id otherwise jQuery won't be able to find it

4855. By Xavier ALT on 2012-08-14

[FIX] web: one2many popup, force usage of global window.top frame counter as stacking fix might use a different jQuery instance

4856. By Xavier ALT on 2012-08-14

[FIX] web: also stop the ascent on many2many form - this is a root controller containing reals _terp_model/_terp_id

4857. By Xavier ALT on 2012-08-14

[FIX] web: fix many2many size when opening from a one2many list

4858. By Xavier ALT on 2012-08-14

[FIX] web: popup width/height size calculation have to use current root window for correct stacking behaviour

4859. By Xavier ALT on 2012-08-21

[MERGE] sync with upstream

4860. By Xavier ALT on 2012-08-23

[FIX] web: fix o2m not getting all data on 3rd level

4861. By Xavier ALT on 2012-08-23

[FIX] web: fix form not submitting all data when _terp_editable is set to '1' - cause eval_domain_and_context failures

4862. By Xavier ALT on 2012-08-24

[FIX] web: one2many: remove the temporary form from DOM after submitting

  - when opening a one2many record, we append the from data within the DOM
    (as some browser might not work properly otherwise), but we HAVE TO remove
    afterward otherwise.
       Currently thoses ghost form are not remove, polluting the DOM and
   leading to problem for code getting the context from the DOM (like building
   POST args from ListView.makeArgs())

4863. By Xavier ALT on 2012-08-24

[FIX] web: one2many: uppon refresh, close popup before reload source list

  - we have to close one2many popup before refresh the source list, otherwise
    ListView.makeArgs() will include content from the popup, which is wrong as
    original list are generate without that information.

4864. By Xavier ALT on 2012-08-24

[FIX] web: listgrid: use OpenO2M controller for getting the right listgrid widget (start on 2nd level of o2m popup stack)

4865. By Xavier ALT on 2012-09-11

[FIX] web: one2many make sure we use original context and domain as view params

4866. By Xavier ALT on 2012-09-13

[FIX] web: listgrid: reload() should take value from parent not root window

4867. By Xavier ALT on 2012-09-13

[FIX] web: one2many: force building final view using *real* information

=== modified file 'addons/openerp/controllers/listgrid.py'
--- addons/openerp/controllers/listgrid.py	2012-07-18 09:35:52 +0000
+++ addons/openerp/controllers/listgrid.py	2012-09-13 15:27:22 +0000
@@ -22,7 +22,7 @@
 import simplejson
 
 import cherrypy
-from openerp.controllers import SecuredController
+from openerp.controllers import SecuredController, openo2m
 from openerp.utils import rpc, TinyDict, TinyForm, TinyFormError, context_with_concurrency_info, cache
 from openerp.widgets import listgrid, listgroup
 
@@ -298,6 +298,8 @@
         if params.wiz_id:
             res = wizard.Wizard().execute(params)
             frm = res['form']
+        elif params.o2m and len(params.o2m.split('/')) > 1:
+            frm = openo2m.OpenO2M().create_form(params)
         else:
             frm = form.Form().create_form(params)
 

=== modified file 'addons/openerp/controllers/openo2m.py'
--- addons/openerp/controllers/openo2m.py	2011-11-17 05:56:40 +0000
+++ addons/openerp/controllers/openo2m.py	2012-09-13 15:27:22 +0000
@@ -46,10 +46,21 @@
         # to get proper view, first generate form using the view_params
         vp = params.view_params
 
+        widget_prefix, _sep, widget_name = (params.o2m or '').rpartition('/')
+        if widget_prefix:
+            prefix_vp = vp.chain_get(widget_prefix)
+            if prefix_vp:
+                vp = prefix_vp
+
         form = tw.form_view.ViewForm(vp, name="view_form", action="/openerp/openo2m/save")
         cherrypy.request.terp_validators = {}
 
-        wid = form.screen.widget.get_widgets_by_name(params.o2m)[0]
+        wid = form.screen.widget.get_widgets_by_name(widget_name)[0]
+
+        if widget_prefix and params.o2m:
+            prefix_params = params.chain_get(params.o2m)
+            if prefix_params:
+                params.update(prefix_params)
 
         # save view_params for later phazes
         vp = vp.make_plain('_terp_view_params/')

=== modified file 'addons/openerp/static/javascript/form.js'
--- addons/openerp/static/javascript/form.js	2012-07-30 12:23:28 +0000
+++ addons/openerp/static/javascript/form.js	2012-09-13 15:27:22 +0000
@@ -69,7 +69,13 @@
 
     if (kind == 'many2many') {
         args['source'] = src;
-        jQuery.frame_dialog({src:openobject.http.getURL(get_form_action('/openerp/openm2m/edit', args))});
+        jQuery.frame_dialog({
+                src: openobject.http.getURL(get_form_action('/openerp/openm2m/edit', args))
+            }, {}, {
+                width: '70%',
+                height: '90%',
+                max_height: 700
+            });
         return;
     }
 
@@ -301,13 +307,18 @@
  * readonly fields (default: excludes disabled fields and fields with
  * readonly="True"
  */
-function getFormData(extended, include_readonly) {
+function getFormData(extended, include_readonly, source) {
 
     var parentNode = openobject.dom.get('_terp_list') || document.forms['view_form'];
 
     var frm = {};
+    var prefix = '';
+    if (source) {
+        prefix = source + '/';
+    }
 
-    var is_editable = jQuery('#_terp_editable').val() == 'True';
+    var editable = jQuery(idSelector(prefix+'_terp_editable')).val();
+    var is_editable = (editable == 'True' || editable == '1') ? true : false;
 
     var $fields = jQuery(parentNode).find('img[kind=picture]');
     if (is_editable) {
@@ -745,7 +756,7 @@
     if (prefix[0] == '_terp_listfields') {
         prefix.shift();
     }
-    var params = jQuery.extend(getFormData(1, true), {
+    var params = jQuery.extend(getFormData(1, true, options.source), {
         '_terp_domain': options.domain,
         '_terp_context': options.context,
         '_terp_prefix': prefix.join('/'),

=== modified file 'addons/openerp/static/javascript/listgrid.js'
--- addons/openerp/static/javascript/listgrid.js	2012-07-30 11:08:14 +0000
+++ addons/openerp/static/javascript/listgrid.js	2012-09-13 15:27:22 +0000
@@ -752,6 +752,8 @@
 
         var current_id = edit_inline ? (parseInt(edit_inline) || 0) : edit_inline;
         var prefix = this.name == '_terp_list' ? '' : this.name + '/';
+        var names = this.name.split('/');
+        var parent_prefix = names.length < 2 ? '' : names.slice(0, names.length - 1).join('/') + '/';
 
         var args = jQuery.extend(this.makeArgs(), {
             _terp_source: this.name,
@@ -766,7 +768,17 @@
             jQuery.extend(args, {
                 _terp_search_domain: openobject.dom.get('_terp_search_domain').value,
                 _terp_search_data: openobject.dom.get('_terp_search_data').value,
-                _terp_filter_domain: openobject.dom.get('_terp_filter_domain').value
+                _terp_filter_domain: openobject.dom.get('_terp_filter_domain').value,
+                _terp_context: openobject.dom.get(prefix + '_terp_context').value,
+                _terp_domain: openobject.dom.get(prefix + '_terp_domain').value
+            });
+        } else {
+            jQuery.extend(args, {
+                _terp_search_domain: "[]",
+                _terp_search_data: "{}",
+                _terp_filter_domain: "[]",
+                _terp_context: openobject.dom.get(parent_prefix + "_terp_context").value,
+                _terp_domain: openobject.dom.get(parent_prefix + "_terp_domain").value
             });
         }
 

=== modified file 'addons/openerp/static/javascript/m2m.js'
--- addons/openerp/static/javascript/m2m.js	2011-01-17 11:57:11 +0000
+++ addons/openerp/static/javascript/m2m.js	2012-09-13 15:27:22 +0000
@@ -184,7 +184,6 @@
                 source_id: options.source || null
             }, {
                 width: '70%',
-                max_width: 1000,
                 height: '90%',
                 max_height: 700
             });

=== modified file 'addons/openerp/static/javascript/m2o.js'
--- addons/openerp/static/javascript/m2o.js	2012-07-19 13:16:48 +0000
+++ addons/openerp/static/javascript/m2o.js	2012-09-13 15:27:22 +0000
@@ -664,8 +664,8 @@
         var $this;
         if(this == $) $this = $(window);
         else $this = $(this);
-        if(window != window.top) {
-            return window.top.jQuery.m2o.apply($this[0], arguments);
+        if(window != window.parent) {
+            return window.parent.jQuery.m2o.apply($this[0], arguments);
         }
         // We're at the top-level window, $this is the window from which the
         // original $.m2o call was performed, window being the current window

=== modified file 'addons/openerp/static/javascript/o2m.js'
--- addons/openerp/static/javascript/o2m.js	2012-06-18 12:32:01 +0000
+++ addons/openerp/static/javascript/o2m.js	2012-09-13 15:27:22 +0000
@@ -58,15 +58,13 @@
 
     this.params_parent = false
     if (this.m2o == "False"){
-        var params_parent_prefix = '';
-        if (!openobject.dom.get('_terp_model')) {
+        var params_parent_prefix = parent_prefix;
+        if (!openobject.dom.get(parent_prefix + '_terp_model')) {
             // Handle case when we create a new one2many record over an unsaved
             // parent record - in that we not do have a valid '_terp_model'
             // within the document, so we just copy original information.
-            params_parent_prefix = '_terp_view_params/';
-        } else {
-            params_parent_prefix = parent_prefix;
-        }
+            params_parent_prefix = '_terp_view_params/' + params_parent_prefix;
+	}
         this.params_parent = {
             '_terp_view_params/_terp_model': openobject.dom.get(params_parent_prefix + '_terp_model').value,
             '_terp_view_params/_terp_id': openobject.dom.get(params_parent_prefix + '_terp_id').value,
@@ -175,6 +173,12 @@
             parents.push(names.shift());
             var prefix = parents.join('/');
 
+            if (!openobject.dom.get(prefix+'/_terp_model')) {
+		// allow skipping some as we only have current level - 1 datas,
+		// so starting on 3rd level we will not have the 1st level anymore
+                continue;
+            }
+
             params['_terp_view_params/' + prefix + '/_terp_model'] = openobject.dom.get(prefix + '/_terp_model').value;
             params['_terp_view_params/' + prefix + '/_terp_id'] = openobject.dom.get(prefix + '/_terp_id').value;
             params['_terp_view_params/' + prefix + '/_terp_ids'] = openobject.dom.get(prefix + '/_terp_ids').value;
@@ -190,6 +194,7 @@
             _terp_parent_view_id: this.parent_view_id,
             _terp_o2m: o2m_name ? o2m_name : this.name,
             _terp_o2m_model: this.model,
+            _terp_o2m_fullname: this.name,
             _terp_parent_view_type: this.parent_view_type,
             _terp_editable: readonly ? 0 : 1,
             _terp_m2o: this.m2o
@@ -252,7 +257,9 @@
      * have nested o2ms somehow), as we need to get a frame we can target
      * with a form submission.
      */
-    var frame_counter = 0;
+    if (window.top.$.o2m_frame_counter === undefined) {
+        window.top.$.o2m_frame_counter = 0;
+    }
 
     function frame_data($this, data) {
         return $($this.attr('frameElement')).data(data);
@@ -268,7 +275,7 @@
      * call.
      */
     function open($this, options) {
-        var frame_identifier = 'test-frame' + frame_counter++;
+        var frame_identifier = 'test-frame' + window.top.$.o2m_frame_counter++;
         var $frame = $.frame_dialog({
             src: 'about:blank',
             // never sure whether the iframe is targetted by name or by id,
@@ -276,7 +283,7 @@
             id: frame_identifier,
             name: frame_identifier
         }, {'source-window': $this[0],
-            'list': options['_terp_o2m']
+            'list': options['_terp_o2m_fullname']
         }, {
             width: '70%',
             height: '90%',
@@ -296,6 +303,7 @@
         });
         setTimeout(function () {
             $form.submit();
+            $form.remove();
         });
         return $frame;
     }
@@ -345,13 +353,14 @@
      */
     function refresh($this, close_o2m) {
         setTimeout(function () {
-            frame_data($this, 'source-window')
-                .ListView(frame_data($this, 'list'))
-                    .reload(null, 1);
+            var source_window = frame_data($this, 'source-window');
+            var source_list = frame_data($this, 'list');
             if(close_o2m) {
+                // close popup before reloading the list, otherwise
+                // ListView.makeArgs() will be confused by content of frame window
                 close($this);
             }
-                
+            source_window.ListView(source_list).reload(null, 1);
         })
     }
 
@@ -391,8 +400,14 @@
         var $this;
         if(this == $) $this = $(window);
         else $this = $(this);
-        if(window != window.top) {
-            return window.top.jQuery.o2m.apply($this[0], arguments);
+        var form_controller = window.form_controller;
+        var is_root_window = false;
+        if (form_controller == '/openerp/openm2o' || form_controller == '/openerp/search/new' || form_controller == '/openerp/openm2m') {
+            // stop unstacking window on M2O popup window
+            is_root_window = true;
+        }
+        if(window != window.parent && !is_root_window) {
+            return window.parent.jQuery.o2m.apply($this[0], arguments);
         }
         // We're at the top-level window, $this is the window from which the
         // original $.o2m call was performed, window being the current window

=== modified file 'addons/openerp/static/javascript/openerp/openerp.ui.textarea.js'
--- addons/openerp/static/javascript/openerp/openerp.ui.textarea.js	2011-01-17 11:57:11 +0000
+++ addons/openerp/static/javascript/openerp/openerp.ui.textarea.js	2012-09-13 15:27:22 +0000
@@ -35,7 +35,7 @@
 openerp.ui.TextArea.prototype = {
 
     __init__ : function(ta) {
-        this.textarea = jQuery('textarea#' + ta)[0];
+        this.textarea = jQuery('textarea' + idSelector(ta))[0];
         this.gripper = DIV({'class' : 'grip'});
 
         this.ta = this.textarea.cloneNode(true);

=== modified file 'openobject/static/javascript/openobject/openobject.dom.js'
--- openobject/static/javascript/openobject/openobject.dom.js	2011-04-08 09:24:41 +0000
+++ openobject/static/javascript/openobject/openobject.dom.js	2012-09-13 15:27:22 +0000
@@ -108,11 +108,11 @@
     }
 
     function get_width(val) {
-        return get_size(val.toString(), $(window.top).width());
+        return get_size(val.toString(), $(window).width());
     }
 
     function get_height(val) {
-        return get_size(val.toString(), $(window.top).height());
+        return get_size(val.toString(), $(window).height());
     }
 
     function get_size(val, available_size) {
@@ -144,8 +144,14 @@
         var $this;
         if(this == $) $this = $(window);
         else $this = $(this);
-        if(window != window.top) {
-            return window.top.jQuery.frame_dialog.apply($this[0], arguments);
+        var form_controller = window.form_controller;
+        var is_root_window = false;
+        if (form_controller == '/openerp/openm2o' || form_controller == '/openerp/search/new' || form_controller == '/openerp/openm2m') {
+            // stop unstacking window on M2O popup window, Search window 'New'
+            is_root_window = true;
+        }
+        if(window != window.parent && !is_root_window) {
+            return window.parent.jQuery.frame_dialog.apply($this[0], arguments);
         }
         return open($this, frame_attrs, data, options);
     }