Merge lp:~xmo-deactivatedaccount/openobject-client-web/m2o-dialogs into lp:openobject-client-web/trunk

[Xavier (Open ERP)]

Branch replacing the existing dialogs for selecting values in m2o (when no filter or initial filter matches more than a single value) by jquery-ui's in-page dialogs (tab-modal)

[Aline (OpenERP) (apr-tinyerp)]

did you try to click "new" ?

[lp:~xmo-deactivatedaccount/openobject-client-web/m2o-dialogs]

4002. By Xavier (Open ERP) on 2010-12-01

[FIX] URL for creation in m2o and m2m popups

4003. By Xavier (Open ERP) on 2010-12-02

[FIX] issue with openLink in popup context

4004. By Xavier (Open ERP) on 2010-12-02

[FIX] make m2o dialog [new] aware of the $.m2o interface and use it, so that it's possible to create new objects via the m2o selector interface

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

[new] should be fixed, there is a known issue with clicking on an m2o link in a readonly form view (popup opens and the [close] button doesn't work).

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

Voilà, j'avais un peu oublié les popups pour voir ou éditer un record m2o, normalement c'est bon maintenant.

[lp:~xmo-deactivatedaccount/openobject-client-web/m2o-dialogs]

4005. By Xavier (Open ERP) on 2010-12-02

[IMP] make m2o popups for single records (edition or readonly) use dialogs as well

[Aline (OpenERP) (apr-tinyerp)]

review: Approve

=== modified file 'addons/openerp/controllers/search.py'
--- addons/openerp/controllers/search.py	2010-11-30 10:18:24 +0000
+++ addons/openerp/controllers/search.py	2010-12-02 08:39:30 +0000
@@ -199,19 +199,18 @@
         data = {}
         res = proxy.fields_get()
 
-        frm = {}
         all_values = {}
 
         for k, v in record.items():
             values = {}
             for key, val in v.items():
                 for field in val:
-                    fld = {}
-                    datas = {}
-                    fld['value'] = val[field]
-                    fld['type'] = res[field].get('type')
+                    fld = {
+                        'value': val[field],
+                        'type': res[field].get('type')
+                    }
+                    datas = {field: fld}
 
-                    data[field] = fld
                     try:
                         frm = TinyForm(**data).to_python()
                     except TinyFormError, e:

=== modified file 'addons/openerp/controllers/templates/openm2o.mako'
--- addons/openerp/controllers/templates/openm2o.mako	2010-09-29 10:26:28 +0000
+++ addons/openerp/controllers/templates/openm2o.mako	2010-12-02 08:39:30 +0000
@@ -15,18 +15,13 @@
         
         jQuery(document).ready(function() {
         
-            var id = parseInt(openobject.dom.get('_terp_id').value) || null;
-            var lc = parseInt(openobject.dom.get('_terp_load_counter').value) || 1;
-
-            if (lc > 1 && id) {
-                window.opener.document.getElementById('${params.m2o}').value = id;
-                window.opener.document.getElementById('${params.m2o}_text').value = '';
-                window.opener.setTimeout("signal(openobject.dom.get('${params.m2o}'), 'onchange')", 0);
-            }
-
-            if (lc > 1) {
-                window.close();
-            }
+            var id = parseInt(openobject.dom.get('_terp_id').value, 10) || null;
+            var lc = parseInt(openobject.dom.get('_terp_load_counter', 10).value) || 1;
+
+            if(lc <= 1) {
+                return;
+            }
+            $.m2o('close', id);
         });
     </script>
 </%def>
@@ -54,7 +49,7 @@
 	                            </td>
                             % endif
                             <td class="save_close">
-                            	<a class="button-a" onclick="window.close()" href="javascript: void(0)">${_("Close")}</a>
+                            	<a class="button-a" onclick="$.m2o('close');" href="javascript: void(0)">${_("Close")}</a>
                             </td>
                             <td width="100%">
                             </td>

=== modified file 'addons/openerp/controllers/templates/search.mako'
--- addons/openerp/controllers/templates/search.mako	2010-11-30 10:49:29 +0000
+++ addons/openerp/controllers/templates/search.mako	2010-12-02 08:39:30 +0000
@@ -1,22 +1,32 @@
 <%inherit file="/openerp/controllers/templates/base_dispatch.mako"/>
+<%!
+    KINDS = {
+        'M2O': 1,
+        'M2M': 2
+    }
+%>        
 
 <%def name="header()">
     <%
-        if params.selectable == 1:
+        if params.selectable == KINDS['M2O']:
             create_url = "/openm2o/edit"
-        elif params.selectable == 2:
+        elif params.selectable == KINDS['M2M']:
             create_url = "/openm2m/new"
     %>
     <title>Search ${form.screen.string}</title>
 
     <script type="text/javascript">
         var form_controller = '/openerp/search';
+        function close_dialog() {
+            window.close()
+        }
     </script>
-    % if params.selectable == 1:
+    % if params.selectable == KINDS['M2O']:
     <script type="text/javascript">
-        function do_select(res_id){
-            var selected_id = res_id
-
+        function close_dialog() {
+            $.m2o('close');
+        }
+        function do_select(selected_id){
             if (!selected_id) {
                 var ids = new ListView('_terp_list').getSelectedRecords();
 
@@ -25,34 +35,10 @@
 
                 selected_id = ids[0];
             }
-
-            var $ = window.opener.jQuery;
-            var $value = $(idSelector('${params.source}'));
-            var $text = $(idSelector('${params.source}_text'));
-
-            $value.val(selected_id);
-            $text.val('');
-
-            if($value[0].onchange) {
-                $value[0].onchange();
-            } else {
-                $value.change();
-                window.opener.MochiKit.Signal.signal($value[0], 'onchange');
-            }
-
-            window.close();
-        }
-        
-        function do_create(){
-            openLink(openobject.http.getURL('/openerp/openm2o/edit', {
-                _terp_model: '${params.model}',
-                _terp_source: '${params.source}',
-                _terp_m2o: '${params.source}',
-                _terp_domain: openobject.dom.get('_terp_domain').value,
-                _terp_context: openobject.dom.get('_terp_context').value}));
+            $.m2o('close', selected_id);
         }
     </script>
-    % elif params.selectable == 2:
+    % elif params.selectable == KINDS['M2M']:
         % if params.get('return_to'):
             <script type="text/javascript">
                 function do_select() {
@@ -76,7 +62,7 @@
                             return;
                        }
                     }
-                    window.close()
+                    close_dialog();
                 }
             </script>
         % else:
@@ -109,21 +95,21 @@
 
 		                m2m.setValue(ids);
 		            }
-		            window.close();
+		            close_dialog();
 		        }
 		    </script>
         % endif
-         <script type="text/javascript">
-                function do_create(){
-                    openLink(openobject.http.getURL('/openerp/openm2m/new', {
-                        _terp_model: '${params.model}',
-                        _terp_source: '${params.source}',
-                        _terp_m2m: '${params.source}',
-                        _terp_domain: openobject.dom.get('_terp_domain').value,
-                        _terp_context: openobject.dom.get('_terp_context').value}));
-                }
-          </script>
     % endif
+    <script type="text/javascript">
+        function do_create(){
+            openLink(openobject.http.getURL('/openerp${create_url}', {
+                _terp_model: '${params.model}',
+                _terp_source: '${params.source}',
+                _terp_m2m: '${params.source}',
+                _terp_domain: openobject.dom.get('_terp_domain').value,
+                _terp_context: openobject.dom.get('_terp_context').value}));
+        }
+    </script>
 </%def>
 
 <%def name="content()">
@@ -160,7 +146,7 @@
                                 % endif
                             	<a class="button-a" href="javascript: void(0)" onclick="search_filter()">${_("Search")}</a>
                            	    <a class="button-a" href="javascript: void(0)" onclick="do_create()">${_("New")}</a>
-                            	<a class="button-a" href="javascript: void(0)" onclick="window.close()">${_("Close")}</a>
+                            	<a class="button-a" href="javascript: void(0)" onclick="close_dialog();">${_("Close")}</a>
                             
                             </td>
                         </tr>
@@ -196,7 +182,7 @@
                 });
             }
             jQuery('table.search_table input:text').eq(0).focus();
-            % if params.selectable == 2:
+            % if params.selectable == KINDS['M2M']:
                 var $select_link = jQuery('a.select-link').hide();
                 jQuery('form#search_form').click(function(event) {
                     if ($(event.target).is("input[type=checkbox]")) {

=== modified file 'addons/openerp/static/css/style.css'
--- addons/openerp/static/css/style.css	2010-11-30 17:30:39 +0000
+++ addons/openerp/static/css/style.css	2010-12-02 08:39:30 +0000
@@ -1022,7 +1022,7 @@
     vertical-align: middle;
 }
 
-.action-dialog,
-.action-dialog .ui-dialog-content {
+iframe.ui-dialog-content {
     padding: 0 !important;
+    width: 100% !important;
 }

=== modified file 'addons/openerp/static/javascript/form.js'
--- addons/openerp/static/javascript/form.js	2010-12-01 17:27:22 +0000
+++ addons/openerp/static/javascript/form.js	2010-12-02 08:39:30 +0000
@@ -720,8 +720,10 @@
     });
 }
 
+var KIND_M2O = 1;
+var KIND_M2M = 2;
 function open_search_window(relation, domain, context, source, kind, text){
-    if (kind == 2 && source.indexOf('_terp_listfields/') == 0) {
+    if (kind == KIND_M2M && source.indexOf('_terp_listfields/') == 0) {
         text = "";
     }
 
@@ -730,14 +732,28 @@
         'domain': domain,
         'context': context
     }).addCallback(function(obj){
-        openobject.tools.openWindow(openobject.http.getURL('/openerp/search/new', {
+        var dialog_url = openobject.http.getURL('/openerp/search/new', {
             'model': relation,
             'domain': obj.domain,
             'context': obj.context,
             'source': source,
             'kind': kind,
             'text': text
-        }));
+        });
+        switch(kind) {
+            case KIND_M2O:
+                jQuery.m2o({
+                    'model': relation,
+                    'domain': obj.domain,
+                    'context': obj.context,
+                    'source': source,
+                    'kind': kind,
+                    'text': text
+                });
+                break;
+            default:
+                openobject.tools.openWindow(dialog_url);
+        }
     });
 }
 

=== modified file 'addons/openerp/static/javascript/m2o.js'
--- addons/openerp/static/javascript/m2o.js	2010-11-29 15:28:52 +0000
+++ addons/openerp/static/javascript/m2o.js	2010-12-02 08:39:30 +0000
@@ -56,13 +56,8 @@
     this.lastKey = null;
     this.delayedRequest = null;
     this.completeDelay = 1;
-    this.hasHiddenValue = false;
     this.lastTextResult = null;
     this.lastSearch = null;
-    this.onlySuggest = false;
-    this.minChars = 1;
-    this.processCount = 0;
-    this.takeFocus = false;
     this.hasFocus = false;
     this.suggestionBoxMouseOver = false;
     this.selectedResult = false;
@@ -103,17 +98,11 @@
         this.field._m2o = this;
 
         this.change_icon();
-
-        if(this.takeFocus) {
-            this.text.focus();
-            this.gotFocus();
-        }
     }
 };
 
 ManyToOne.prototype.gotFocus = function(evt) {
     this.hasFocus = true;
-    if(!this.minChars) this.on_keyup(evt);
 };
 
 ManyToOne.prototype.lostFocus = function() {
@@ -167,10 +156,15 @@
         domain: domain,
         context: context
     }).addCallback(function(obj) {
-        openobject.tools.openWindow(openobject.http.getURL('/openerp/openm2o/edit', {
-            _terp_model: model, _terp_id: id,
-            _terp_domain: obj.domain, _terp_context: obj.context,
-            _terp_m2o: source, _terp_editable: editable ? 'True' : 'False'}));
+        $.m2o({
+            record: true,
+            _terp_model: model,
+            _terp_id: id,
+            _terp_domain: obj.domain,
+            _terp_context: obj.context,
+            _terp_m2o: source,
+            _terp_editable: editable ? 'True' : 'False'
+        });
     });
 };
 
@@ -235,7 +229,7 @@
     // Stop processing if a special key has been pressed. Or if the last search requested the same string
     if(this.specialKeyPressed || (this.text.value == this.lastSearch)) return false;
 
-    if(this.minChars && this.text.value.length < this.minChars) {
+    if(!this.text.value.length) {
         if(this.delayedRequest) {
             this.delayedRequest.cancel();
             this.clearResults();
@@ -287,10 +281,6 @@
             case 13:
             case 1:
                 var $selectedRow = jQuery(idSelector("autoComplete" + this.name + "_" + this.selectedResultRow));
-                if(this.onlySuggest && $selectedRow.length) {
-                    this.clearResults();
-                    break;
-                }
 
                 this.setCompletionText($selectedRow);
 
@@ -436,14 +426,12 @@
     var val = s.lastIndexOf(',') >= 0 ? s.substring(s.lastIndexOf(',') + 1).replace(/^\s+|\s+$/g, "") : s.replace(/^\s+|\s+$/g, "");
 
     // Check again if less than required chars, then we won't search.
-    if(this.minChars && val.length < this.minChars) {
+    if(!val.length) {
         this.clearResults();
         return false;
     }
 
     // Get what we are searching for
-    this.processCount++;
-
     this.lastSearch = this.text.value;
     jQuery.getJSON('/openerp/search/get_matched', {
         text: val,
@@ -456,7 +444,6 @@
     try {
         if(!this.hasFocus) {
             this.updateSelectedResult();
-            this.processCount--;
             return false;
         }
 
@@ -466,10 +453,7 @@
             "id": "autoCompleteTable" + this.name});
         this.numResultRows = result.values.length;
 
-        if(this.onlySuggest)
-            this.selectedResultRow = null;
-        else
-            this.selectedResultRow = 0;
+        this.selectedResultRow = 0;
 
         var mouseOver = jQuery.proxy(this, 'getMouseover');
         var onClick = jQuery.proxy(this, 'getOnclick');
@@ -501,7 +485,6 @@
             $resultsHolder.hide();
         }
 
-        this.processCount--;
         return true;
     }
     catch(e) {
@@ -538,3 +521,105 @@
     evt.which = 13;
     this.on_keydown(evt);
 };
+
+(function ($) {
+    /**
+     * Opens an m2o dialog linked to the provided <code>$this</code> window,
+     * with the selected options.
+     *
+     * @param $this the parent window of the opened dialog, contains the
+     * input to fill with the selected m2o value if any
+     * @param options A map of options to provide to the xhr call.
+     * The <code>source</code> key is also used for the id of the element
+     * (in <code>$this</code>) on which any selected m2o value should be set.
+     * The <code>record</code> key indicates whether a record should be opened
+     * instead of a search view
+     */
+    function open($this, options) {
+        var url;
+        if(options.record) {
+            url = '/openerp/openm2o/edit'
+        } else {
+            url = '/openerp/search/new';
+        }
+        return $('<iframe>', {
+            src: openobject.http.getURL(url, options),
+            frameborder: 0
+        }).data('source_window', $this[0])
+          .data('source_id', options.source || null)
+          .appendTo(document.documentElement)
+          .dialog({
+              modal: true,
+              width: 640,
+              height: 480,
+              close: function () {
+                  jQuery(this).dialog('destroy').remove();
+              }
+          });
+    }
+
+    /**
+     * Closes the m2o dialog it was called from (represented by
+     * <code>$this</code>, setting the related m2o input to the provided
+     * <code>value</code>, if any.
+     *
+     * @param $this the window of the dialog to close
+     * @param value optional, the value to set the m2o input to if it is
+     * provided
+     */
+    function close($this, value) {
+        var $frame = $($this.attr('frameElement'));
+        if(value) {
+            // the m2o input to set is in the source_window, which is set as
+            // a `data` of the dialog iframe
+            var jQ = $frame.data('source_window').jQuery;
+            var source_id = $frame.data('source_id');
+            jQ(idSelector(source_id + '_text')).val('');
+            var $m2o_field = jQ(idSelector(source_id)).val(value);
+
+            if($m2o_field[0].onchange) {
+                $m2o_field[0].onchange();
+            } else {
+                $m2o_field.change();
+            }
+        }
+        $frame.dialog('close');
+        return null;
+    }
+
+    /**
+     * Manage m2o dialogs for this scope
+     * <ul>
+     *  <li><p>Called with only options, opens a new m2o dialog linking to the
+     *         current scope.</p></li>
+     *  <li><p>Called with the <code>"close"</code> command, closes the m2o
+     *         dialog it was invoked from and focuses its parent scope.
+     *  </p></li>
+     *  <li><p>Called with the <code>"close"</code> command and an argument,
+     *         sets that argument as the m2o value of the parent widget and
+     *         closes the m2o dialog it was invoked from as above.
+     *  </p></li>
+     * </ul>
+     *
+     * @returns the m2o container (iframe) if one was created
+     */
+    $.m2o = function () {
+        // $this should be the holder for the window from which $.m2o was
+        // originally called, even if $.m2o() was bubbled to the top of
+        // the window stack.
+        var $this;
+        if(this == $) $this = $(window);
+        else $this = $(this);
+        if(window != window.top) {
+            return window.top.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
+        // level.
+        if(arguments[0] === "close") {
+            return close($this, arguments[1]);
+        } else {
+            return open($this, arguments[0]);
+        }
+    };
+})(jQuery);

=== modified file 'addons/openerp/static/javascript/openerp/openerp.base.js'
--- addons/openerp/static/javascript/openerp/openerp.base.js	2010-11-29 11:13:59 +0000
+++ addons/openerp/static/javascript/openerp/openerp.base.js	2010-12-02 08:39:30 +0000
@@ -25,9 +25,7 @@
             error: loadingError
         });
     } else {
-        window.location.assign(
-            '/?' + jQuery.param({next: url})
-        );
+        window.location.assign(url);
     }
 }
 /**
@@ -100,27 +98,19 @@
     var $dialogs = jQuery('.action-dialog');
     switch(target) {
         case 'new':
-            var $contentFrame = jQuery('<iframe>', {
+            jQuery('<iframe>', {
                 src: action_url,
-                frameborder: 0,
-                width: '99%',
-                height: '99%'
-            });
-            jQuery('<div class="action-dialog">')
-                .appendTo(document.documentElement)
+                'class': 'action-dialog',
+                frameborder: 0
+            }).appendTo(document.documentElement)
                 .dialog({
                     modal: true,
                     width: 640,
                     height: 480,
                     close: function () {
-                        var $this = jQuery(this);
-                        $this.find('iframe').remove();
-                        setTimeout(function () {
-                            $this.dialog('destroy').remove();
-                        });
+                        jQuery(this).dialog('destroy').remove();
                     }
-                })
-                .append($contentFrame);
+                });
             break;
         case 'current':
         default: