summaryrefslogtreecommitdiff
path: root/addons/web/doc
diff options
context:
space:
mode:
authorOlivier Dony <odo@openerp.com>2013-05-21 16:57:21 +0200
committerOlivier Dony <odo@openerp.com>2013-05-21 16:57:21 +0200
commit87d4e69a652df9bb16ed8977f602a0cc3d9d734c (patch)
treeaaec864c4beba60813f81cc38bc603beac0967aa /addons/web/doc
parent2ae6b2ee61a035673d863063545c88dae9d4c602 (diff)
parentf0ae319dec9db6256c41e70e4be4c800c5d470e4 (diff)
[MERGE] web doc: less confusing client action example, courtesy of Nhomar (Vauxoo)
bzr revid: odo@openerp.com-20130521145721-v9vz5e8n7127z9vy
Diffstat (limited to 'addons/web/doc')
-rw-r--r--addons/web/doc/module/static/src/js/first_module.js.2.diff4
-rw-r--r--addons/web/doc/module/static/src/js/first_module.js.3.diff4
2 files changed, 4 insertions, 4 deletions
diff --git a/addons/web/doc/module/static/src/js/first_module.js.2.diff b/addons/web/doc/module/static/src/js/first_module.js.2.diff
index 88a80f50fff..f3bceecdc78 100644
--- a/addons/web/doc/module/static/src/js/first_module.js.2.diff
+++ b/addons/web/doc/module/static/src/js/first_module.js.2.diff
@@ -4,8 +4,8 @@
// static/src/js/first_module.js
openerp.web_example = function (instance) {
- console.log("Module loaded");
-+ instance.web.client_actions.add('example.action', 'instance.web_example.action');
-+ instance.web_example.action = function (parent, action) {
++ instance.web.client_actions.add('example.action', 'instance.web_example.Action');
++ instance.web_example.Action = function (parent, action) {
+ console.log("Executed the action", action);
+ };
};
diff --git a/addons/web/doc/module/static/src/js/first_module.js.3.diff b/addons/web/doc/module/static/src/js/first_module.js.3.diff
index 295e90b6840..ecab3ee1832 100644
--- a/addons/web/doc/module/static/src/js/first_module.js.3.diff
+++ b/addons/web/doc/module/static/src/js/first_module.js.3.diff
@@ -3,8 +3,8 @@
@@ -1,7 +1,11 @@
// static/src/js/first_module.js
openerp.web_example = function (instance) {
-- instance.web.client_actions.add('example.action', 'instance.web_example.action');
-- instance.web_example.action = function (parent, action) {
+- instance.web.client_actions.add('example.action', 'instance.web_example.Action');
+- instance.web_example.Action = function (parent, action) {
- console.log("Executed the action", action);
- };
+ instance.web.client_actions.add('example.action', 'instance.web_example.Action');