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

[Xavier ALT]

Hi,

This as missing support for "nodestroy" flag on ir.actions.act_window (on-the-fly action can use this flag to present the original wizard dialog to close).

Regards,
Xavier

=== modified file 'addons/openerp/controllers/actions.py'
--- addons/openerp/controllers/actions.py	2012-06-08 15:17:28 +0000
+++ addons/openerp/controllers/actions.py	2012-07-09 08:36:20 +0000
@@ -350,6 +350,9 @@
             cherrypy.response.headers['active_id'] = cherrypy.request.params.get('_terp_id')\
             or cherrypy.request.params.context.get('active_id')
 
+    # when action 'open a new tab', make sure we follow 'nodestroy' flag, if set.
+    no_destroy = (action.get('nodestroy') and open_new_tab) and 'true' or 'false'
+
     # Add 'opened' mark to indicate we're now within the popup and can
     # continue on during the second round of execution
     payload = str({
@@ -370,11 +373,12 @@
         url = '/?' + urllib.urlencode({'next': url})
         
     cherrypy.response.headers['X-Target'] = action['target']
+    cherrypy.response.headers['X-No-Destroy'] = no_destroy
     cherrypy.response.headers['Location'] = url
     return """<script type="text/javascript">
-        window.top.openAction('%s', '%s');
+        window.top.openAction('%s', '%s', false, %s);
     </script>
-    """ % (url, action['target'])
+    """ % (url, action['target'], no_destroy)
 
 def execute(action, **data):
     """Execute the action with the provided data. for internal use only.

=== modified file 'addons/openerp/static/javascript/openerp/openerp.base.js'
--- addons/openerp/static/javascript/openerp/openerp.base.js	2012-06-08 15:50:35 +0000
+++ addons/openerp/static/javascript/openerp/openerp.base.js	2012-07-09 08:36:20 +0000
@@ -111,10 +111,13 @@
     return function (data, status, xhr) {
         var target;
         var active_id;
+        var nodestroy;
         if(xhr.getResponseHeader){
             target = xhr.getResponseHeader('X-Target');
+            nodestroy = xhr.getResponseHeader('X-No-Destroy');
             active_id = xhr.getResponseHeader('active_id');
         }
+        nodestroy = (nodestroy && nodestroy == 'true') ? true : false;
         if(target) {
             var _openAction;
             if (window.top.openAction) {
@@ -122,7 +125,7 @@
             } else {
                 _openAction = openAction;
             }
-            _openAction(xhr.getResponseHeader('Location'), target, active_id);
+            _openAction(xhr.getResponseHeader('Location'), target, active_id, nodestroy);
             return;
         }
         if(url) {
@@ -167,7 +170,7 @@
  * @param action_url the URL of the action to open
  * @param target the target, if any, defaults to 'current'
  */
-function openAction(action_url, target, terp_id) {
+function openAction(action_url, target, terp_id, nodestroy) {
     var $dialogs = jQuery('.action-dialog');
     switch(target) {
         case 'new':
@@ -206,7 +209,11 @@
         default:
             openLink(action_url);
     }
-    $dialogs.dialog('close');
+    if (!(nodestroy && nodestroy === true)) {
+        // close dialog only if 'nodestroy' flag is not set
+        // (_default_ behaviour is to close the dialog)
+        $dialogs.dialog('close');
+    }
 }
 function closeAction() {
     jQuery('.action-dialog').dialog('close');