From f0ae319dec9db6256c41e70e4be4c800c5d470e4 Mon Sep 17 00:00:00 2001 From: Nhomar Hernandez Date: Fri, 17 May 2013 16:26:08 -0430 Subject: [PATCH] [IMP] When we go step by step, change the Case for a variable in a diff Is a little confufing, in our case 100% of time our team had problems confusing Action with action Obtaining an error with prototype because incorrect declaration. IMHO this is a No-Brain merge, but i explain well to be sure you understand my point. bzr revid: nhomar@gmail.com-20130517205608-wykuz0oxjccf6021 --- addons/web/doc/module/static/src/js/first_module.js.2.diff | 4 ++-- addons/web/doc/module/static/src/js/first_module.js.3.diff | 4 ++-- 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');