summaryrefslogtreecommitdiff
path: root/addons/base/static/src
diff options
context:
space:
mode:
authorniv-openerp <nicolas.vanhoren@openerp.com>2011-06-06 09:52:43 +0200
committerniv-openerp <nicolas.vanhoren@openerp.com>2011-06-06 09:52:43 +0200
commitf2dca934a35f9efc908159eb33a1d833cf1b8934 (patch)
treeff7872b4371ff72db767e911bcc5e46bafcc0b51 /addons/base/static/src
parent147ca866608f166e8879940c32abd6e70395a0b5 (diff)
[imp] put set_embedded_view in openerp.base.View
bzr revid: nicolas.vanhoren@openerp.com-20110606075243-7b97zrb84qdfo4eu
Diffstat (limited to 'addons/base/static/src')
-rw-r--r--addons/base/static/src/js/form.js9
-rw-r--r--addons/base/static/src/js/list.js9
-rw-r--r--addons/base/static/src/js/views.js10
3 files changed, 10 insertions, 18 deletions
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 7bf2059243d..2b09c4ac27c 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -40,15 +40,6 @@ openerp.base.FormView = openerp.base.View.extend( /** @lends openerp.base.FormV
toolbar:!!this.flags.sidebar}, this.on_loaded);
}
},
- /**
- * Directly set a view to use instead of calling fields_view_get. This method must
- * be called before start().
- *
- * @param embedded_view A view.
- */
- set_embedded_view: function(embedded_view) {
- this.embedded_view = embedded_view;
- },
on_loaded: function(data) {
var self = this;
this.fields_view = data.fields_view;
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 7bc14298fb6..7643e2b62d4 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -272,15 +272,6 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
}
},
/**
- * Directly set a view to use instead of calling fields_view_get. This method must
- * be called before start().
- *
- * @param embedded_view A view.
- */
- set_embedded_view: function(embedded_view) {
- this.embedded_view = embedded_view;
- },
- /**
* re-renders the content of the list view
*/
reload_content: function () {
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 39708e717a0..4c259babd8f 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -399,6 +399,16 @@ openerp.base.View = openerp.base.Controller.extend({
return dataset.exec_workflow(record_id, action_data.name, handler);
}
}
+ },
+ /**
+ * Directly set a view to use instead of calling fields_view_get. This method must
+ * be called before start(). When an embedded view is set, underlying implementations
+ * of openerp.base.View must use the provided view instead of any other one.
+ *
+ * @param embedded_view A view.
+ */
+ set_embedded_view: function(embedded_view) {
+ this.embedded_view = embedded_view;
}
});