Merge lp:~jfb-tempo-consulting/unifield-web/us-1335 into lp:unifield-web

[jftempo]

=== modified file 'addons/openerp/controllers/actions.py'
--- addons/openerp/controllers/actions.py	2016-11-25 09:20:18 +0000
+++ addons/openerp/controllers/actions.py	2017-01-13 15:45:45 +0000
@@ -424,6 +424,7 @@
         action['target'] = 'popup'
         open_new_tab = True
 
+
     # search_view key in action is >8k added to the URL every time, which
     # breaks firefox (and probably Apache) as it's shoved into a header and
     # then used back as a URL
@@ -458,6 +459,8 @@
 
     cherrypy.response.headers['X-Target'] = action['target']
     cherrypy.response.headers['Location'] = url
+    if action and action.get('keep_open'):
+        cherrypy.response.headers['keep-open'] = 1
     return """<script type="text/javascript">
         window.top.openAction('%s', '%s');
     </script>
@@ -594,6 +597,8 @@
 
 @tools.expose(template="/openerp/controllers/templates/report.mako")
 def report_link(report_name, **kw):
+    if kw.get('keep_open'):
+        cherrypy.response.headers['keep-open'] = 1
     cherrypy.response.headers['X-Target'] = 'download'
     cherrypy.response.headers['Location'] = tools.url(
         '/openerp/report', report_name=report_name, **kw)

=== modified file 'addons/openerp/static/javascript/openerp/openerp.base.js'
--- addons/openerp/static/javascript/openerp/openerp.base.js	2016-08-29 07:31:56 +0000
+++ addons/openerp/static/javascript/openerp/openerp.base.js	2017-01-13 15:45:45 +0000
@@ -122,9 +122,11 @@
     return function (data, status, xhr) {
         var target;
         var active_id;
+        var keep_open = false;
         if(xhr.getResponseHeader){
             target = xhr.getResponseHeader('X-Target');
             active_id = xhr.getResponseHeader('active_id');
+            keep_open = xhr.getResponseHeader('keep-open');
         }
         if(target) {
             var _openAction;
@@ -133,7 +135,7 @@
             } else {
                 _openAction = openAction;
             }
-            _openAction(xhr.getResponseHeader('Location'), target, active_id);
+            _openAction(xhr.getResponseHeader('Location'), target, active_id, keep_open);
             return;
         }
         if(url) {
@@ -181,7 +183,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, keep_open) {
     var $dialogs = jQuery('.action-dialog');
     switch(target) {
         case 'new':
@@ -228,7 +230,9 @@
         default:
             openLink(action_url);
     }
-    $dialogs.dialog('close');
+    if (!keep_open) {
+        $dialogs.dialog('close');
+    }
 }
 function closeAction() {
     jQuery('.action-dialog').dialog('close');