diff options
| author | Vishmita Jadeja (openerp) <vja@tinyerp.com> | 2013-05-01 11:11:29 +0530 |
|---|---|---|
| committer | Vishmita Jadeja (openerp) <vja@tinyerp.com> | 2013-05-01 11:11:29 +0530 |
| commit | 3b7863b479593fd6f2ccba8996f227f8d2e7df25 (patch) | |
| tree | 0ce0101d6938cc5217c2ab69b52126a369766b3e /addons/web/doc/module/static/src/js/first_module.js.2.diff | |
| parent | ae6d15de59251618a21d4520e50456fd9777de33 (diff) | |
| parent | 511efd43a90b6bbc30bac9764358fc81b42fb13a (diff) | |
[Merge]Merge with trunk
bzr revid: vja@tinyerp.com-20130501054129-2ie8kj73yosxbfo8
Diffstat (limited to 'addons/web/doc/module/static/src/js/first_module.js.2.diff')
| -rw-r--r-- | addons/web/doc/module/static/src/js/first_module.js.2.diff | 11 |
1 files changed, 0 insertions, 11 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 deleted file mode 100644 index 88a80f50fff..00000000000 --- a/addons/web/doc/module/static/src/js/first_module.js.2.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- web_example/static/src/js/first_module.js -+++ web_example/static/src/js/first_module.js -@@ -1,4 +1,7 @@ - // 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) { -+ console.log("Executed the action", action); -+ }; - }; |