summaryrefslogtreecommitdiff
path: root/addons/base/static/src/js
diff options
context:
space:
mode:
authorAntony Lesuisse <al@openerp.com>2011-07-22 14:15:42 +0200
committerAntony Lesuisse <al@openerp.com>2011-07-22 14:15:42 +0200
commit50180134f12e77e048acc20cae034eacd0b2e6e0 (patch)
tree71b4e24279940623ff97bbf72c095da2e9c45232 /addons/base/static/src/js
parent519b0350d20897bacfae274e5263a3f42b8feb49 (diff)
[FIX] controller alias parent and children for backward compatibility
bzr revid: al@openerp.com-20110722121542-9qgldsrz9b2t050a
Diffstat (limited to 'addons/base/static/src/js')
-rw-r--r--addons/base/static/src/js/controller.js3
-rw-r--r--addons/base/static/src/js/views.js13
2 files changed, 16 insertions, 0 deletions
diff --git a/addons/base/static/src/js/controller.js b/addons/base/static/src/js/controller.js
index fc124e9ec99..1a100b6cc75 100644
--- a/addons/base/static/src/js/controller.js
+++ b/addons/base/static/src/js/controller.js
@@ -167,6 +167,9 @@ instance.base.Controller = instance.base.Class.extend( /** @lends instance.base.
if(parent && parent.controller_children) {
parent.controller_children.push(this);
}
+ // backward compatibility
+ this.parent = this.controller_parent;
+ this.children = this.controller_children;
// Transform on_* method into openerp.base.callbacks
for (var name in this) {
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index d14fdcbc12f..49049a196dd 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -18,6 +18,18 @@ openerp.base.ActionManager = openerp.base.Controller.extend({
* Process an action
* Supported actions: act_window
*/
+ action_window: function() {
+ },
+ action_window_close: function() {
+ },
+ action_server: function() {
+ },
+ action_url: function() {
+ },
+ action_report: function() {
+ },
+ action_client: function() {
+ },
do_action: function(action, on_closed) {
var self = this;
action.flags = _.extend({
@@ -264,6 +276,7 @@ openerp.base.NullViewManager = openerp.base.generate_null_object_class(openerp.b
}
});
+// TODO Will move to action Manager
openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
init: function(parent, element_id, action) {
this.session = parent.session;