← Back to branch summary

~openerp-dev/openobject-client-web/ir_action_act_url

« back to all changes in this revision

Viewing changes to addons/openerp/static/javascript/openerp/openerp.base.js

  • Committer: vda(Open ERP)
  • Date: 2010-11-25 09:26:47 UTC
  • Revision ID: vda@tinyerp.com-20101125092647-4ycguh7ryv34cv15
https://launchpad.net/bugs/680672
[FIX] AppContent data remains when reports or ir.action.act_url(we do not have returned controller).

Show diffs side-by-side

added added

removed removed

Lines of Context:
addons/openerp/static/javascript/openerp/openerp.base.js
77
77
            window.top.openAction(action_url, target);
78
78
            return;
79
79
        }
 
80
        
80
81
        jQuery(window).trigger('before-appcontent-change');
81
 
        jQuery(app).html(xhr.responseText || data);
 
82
        if (jQuery(xhr.responseText || data).find('input#is_act_url').length) {
 
83
            if (!jQuery(app).find('input#is_act_url').length) {
 
84
                jQuery(app).append(jQuery('<div>', {'id': 'action_url'}))
 
85
                jQuery('#action_url').html(xhr.responseText || data)
 
86
            }
 
87
            else {
 
88
                jQuery(app).find('#action_url').html(xhr.responseText || data)
 
89
            }
 
90
        }
 
91
        else {
 
92
            jQuery(app).html(xhr.responseText || data);
 
93
        }
82
94
        jQuery(window).trigger('after-appcontent-change');
83
95
    }
84
96
}