summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorJulien Legros <jle@odoo.com>2016-01-25 11:26:27 +0100
committerJulien Legros <jle@odoo.com>2016-01-25 11:26:27 +0100
commite5e7c4c1217c04d93820cf6007fd8ceed30d0cfa (patch)
tree0c475b2aa9f8f1b92f1550466cc189f1ba36230b /addons/web/static/src
parent85b39df834c8689fd22e1a56d780af703a61909d (diff)
parent6872aae8ef9c1a1fc6a8283aa9d12ce3a6859157 (diff)
[MERGE] forward port of branch 9.0 up to 6872aae
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/css/base.css1
-rw-r--r--addons/web/static/src/css/base.sass1
-rw-r--r--addons/web/static/src/js/widgets/debug_manager.js13
-rw-r--r--addons/web/static/src/less/utils.less2
-rw-r--r--addons/web/static/src/xml/base.xml4
5 files changed, 8 insertions, 13 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index b8f5a998cd7..fddbbe25800 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2831,6 +2831,7 @@ body.oe_single_form .oe_single_form_container {
}
.openerp .oe-view-manager {
display: block;
+ overflow: visible;
}
.openerp .oe_application, .openerp .oe_view_manager_wrapper {
height: auto !important;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index eee7739b3f6..f82d77c624c 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2413,6 +2413,7 @@ body.oe_single_form
height: auto !important
.oe-view-manager
display: block
+ overflow: visible
.oe_application, .oe_view_manager_wrapper
height: auto !important
.oe_application > div > .oe_view_manager > .oe_view_manager_wrapper > div > .oe_view_manager_body
diff --git a/addons/web/static/src/js/widgets/debug_manager.js b/addons/web/static/src/js/widgets/debug_manager.js
index 610dcd7819e..36a3a205632 100644
--- a/addons/web/static/src/js/widgets/debug_manager.js
+++ b/addons/web/static/src/js/widgets/debug_manager.js
@@ -5,6 +5,7 @@ var core = require('web.core');
var Dialog = require('web.Dialog');
var formats = require('web.formats');
var framework = require('web.framework');
+var Model = require('web.Model');
var session = require('web.session');
var SystrayMenu = require('web.SystrayMenu');
var utils = require('web.utils');
@@ -148,15 +149,9 @@ if (core.debug) {
});
},
translate: function() {
- this.do_action({
- name: _t("Technical Translation"),
- res_model : 'ir.translation',
- domain : [['type', '!=', 'object'], '|', ['name', '=', this.dataset.model], ['name', 'ilike', this.dataset.model + ',']],
- views: [[false, 'list'], [false, 'form']],
- type : 'ir.actions.act_window',
- view_type : "list",
- view_mode : "list"
- });
+ new Model("ir.translation")
+ .call('get_technical_translations', [this.dataset.model])
+ .then(this.do_action);
},
edit: function(params, evt) {
this.do_action({
diff --git a/addons/web/static/src/less/utils.less b/addons/web/static/src/less/utils.less
index 9adca6f6679..da69e2c0aa9 100644
--- a/addons/web/static/src/less/utils.less
+++ b/addons/web/static/src/less/utils.less
@@ -189,7 +189,7 @@
// ------------------------------------------------------------------
// Transition
// ------------------------------------------------------------------
-.o-transition(@property: all, @duration: 0s, @timing-function: easy, @transition-delay: 0s) {
+.o-transition(@property: all, @duration: 0s, @timing-function: ease, @transition-delay: 0s) {
-webkit-transition: @property @duration @timing-function @transition-delay;
-moz-transition: @property @duration @timing-function @transition-delay;
-o-transition: @property @duration @timing-function @transition-delay;
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 713a1cf18de..a8c24000c6b 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -867,13 +867,11 @@
><img t-attf-src="#{prefix}/web/static/src/img/icons/#{widget.icon}.png" t-att-alt="widget.string" width="16" height="16"/>
</t>
<t t-name="FieldMany2ManyTag">
- <t t-set="i" t-value="0"/>
<t t-foreach="elements" t-as="el">
- <span t-attf-class="badge dropdown #{'o_tag_color_' + (el['color'] || 0)}" t-att-data-color="(el['color'] || 0)" t-att-data-index="i" t-att-data-id="el['id']">
+ <span t-attf-class="badge dropdown #{'o_tag_color_' + (el['color'] || 0)}" t-att-data-color="(el['color'] || 0)" t-att-data-index="el_index" t-att-data-id="el['id']">
<t t-esc="el['display_name']"/>
<span t-if="!readonly" class="fa fa-times o_delete"/>
</span>
- <t t-set="i" t-value="i + 1"/>
</t>
</t>
<t t-name="FieldMany2ManyTag.colorpicker">