diff options
| author | vta vta@openerp.com <> | 2012-08-30 09:05:01 +0200 |
|---|---|---|
| committer | vta vta@openerp.com <> | 2012-08-30 09:05:01 +0200 |
| commit | e2d9e9e2f7f1e0728e46836fcaacebaf38d7bed1 (patch) | |
| tree | 252b9180aa13d5fe3ec601911d62a88f63c47b17 /addons/web_tests | |
| parent | c7264344a838575b62be221a6df004b1bcfd0f83 (diff) | |
| parent | 6e943465be4c6df2a356b93e7be8a1da4eb8d74f (diff) | |
[MERGE] Merged latest trunk.
bzr revid: vta@openerp.com-20120830070501-qy3am8pj7q3xm0oi
Diffstat (limited to 'addons/web_tests')
| -rw-r--r-- | addons/web_tests/__openerp__.py | 18 | ||||
| -rw-r--r-- | addons/web_tests/i18n/es_CR.po | 4 | ||||
| -rw-r--r-- | addons/web_tests/static/src/js/web_tests.js | 4 |
3 files changed, 15 insertions, 11 deletions
diff --git a/addons/web_tests/__openerp__.py b/addons/web_tests/__openerp__.py index b76028b9418..b34f96f78b2 100644 --- a/addons/web_tests/__openerp__.py +++ b/addons/web_tests/__openerp__.py @@ -1,10 +1,14 @@ { - "name": "Tests", - "category": "Hidden", - "description":"""OpenERP Web test suite.""", - "version": "2.0", - "depends": [], - "js": ["static/src/js/*.js"], - "css": ['static/src/css/*.css'], + 'name': 'Tests', + 'category': 'Hidden', + 'description': """ +OpenERP Web test suite. +======================= + +""", + 'version': '2.0', + 'depends': [], + 'js': ['static/src/js/*.js'], + 'css': ['static/src/css/*.css'], 'auto_install': True, } diff --git a/addons/web_tests/i18n/es_CR.po b/addons/web_tests/i18n/es_CR.po index c3dad325ed1..5f4d870c7fe 100644 --- a/addons/web_tests/i18n/es_CR.po +++ b/addons/web_tests/i18n/es_CR.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n" -"X-Generator: Launchpad (build 15801)\n" +"X-Launchpad-Export-Date: 2012-08-28 07:24+0000\n" +"X-Generator: Launchpad (build 15864)\n" diff --git a/addons/web_tests/static/src/js/web_tests.js b/addons/web_tests/static/src/js/web_tests.js index ffc32a93aaf..5b9c1d02503 100644 --- a/addons/web_tests/static/src/js/web_tests.js +++ b/addons/web_tests/static/src/js/web_tests.js @@ -18,7 +18,7 @@ openerp.web_tests = function (instance) { start: function () { $.when( this.dataset.read_slice(), - this.form.appendTo(this.$element)).then(this.on_everything_loaded); + this.form.appendTo(this.$el)).then(this.on_everything_loaded); }, on_everything_loaded: function (slice) { var records = slice[0].records; @@ -29,7 +29,7 @@ openerp.web_tests = function (instance) { this.form.on_record_loaded(records[0]); _(records.slice(1)).each(function (record, index) { this.dataset.index = index+1; - this.form.reposition($('<div>').appendTo(this.$element)); + this.form.reposition($('<div>').appendTo(this.$el)); this.form.on_record_loaded(record); }, this); } |