summaryrefslogtreecommitdiff
path: root/addons/web/static
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2017-10-11 16:37:38 +0200
committerqsm-odoo <qsm@odoo.com>2017-10-12 13:39:17 +0200
commit03ef19e40c0fc378c18fa0dbfa830f29be852406 (patch)
tree2ebc2f49f5dafe88913323528a78f335dfa85e00 /addons/web/static
parentb8dac2ff32d2e875e2f43c91f702e17adc938f7e (diff)
[FIX] web, hr_timesheet_sheet: make m2o friendly-usable outside of views
Before this commit, m2o external button was always floating outside the m2o main DOM element, on the right. This induced problems when using the m2o outside of views (like in Odoo Studio). Now, the m2o design is made so that this button is inside the m2o, except in form views where we expect the button to overflow in the tables' right paddings.
Diffstat (limited to 'addons/web/static')
-rw-r--r--addons/web/static/src/js/fields/relational_fields.js2
-rw-r--r--addons/web/static/src/less/fields.less10
-rw-r--r--addons/web/static/src/less/form_view.less17
-rw-r--r--addons/web/static/src/less/list_view.less3
4 files changed, 13 insertions, 19 deletions
diff --git a/addons/web/static/src/js/fields/relational_fields.js b/addons/web/static/src/js/fields/relational_fields.js
index 194165b2206..9218897fb1f 100644
--- a/addons/web/static/src/js/fields/relational_fields.js
+++ b/addons/web/static/src/js/fields/relational_fields.js
@@ -422,7 +422,7 @@ var FieldMany2One = AbstractField.extend({
_updateExternalButton: function () {
var has_external_button = !this.nodeOptions.no_open && !this.floating && this.isSet();
this.$external_button.toggle(has_external_button);
- this.$el.toggleClass('o_with_button', has_external_button);
+ this.$el.toggleClass('o_with_button', has_external_button); // Should not be required anymore but kept for compatibility
},
diff --git a/addons/web/static/src/less/fields.less b/addons/web/static/src/less/fields.less
index 02885ef3514..fe7a4ad0d8e 100644
--- a/addons/web/static/src/less/fields.less
+++ b/addons/web/static/src/less/fields.less
@@ -49,7 +49,7 @@
// Dropdowns input (many2one, ...)
.o_input_dropdown {
- .o-flex(1, 0, auto);
+ .o-flex(1, 1, auto);
position: relative;
width: 100%;
@@ -185,14 +185,6 @@
color: @brand-success;
}
- // Many2One
- &.o_field_many2one {
- .o-inline-flex-display();
- > span, > button {
- .o-flex(0, 0, auto);
- }
- }
-
// Handle widget
&.o_row_handle {
cursor: ns-resize;
diff --git a/addons/web/static/src/less/form_view.less b/addons/web/static/src/less/form_view.less
index c4990e6c824..7224ff5c20d 100644
--- a/addons/web/static/src/less/form_view.less
+++ b/addons/web/static/src/less/form_view.less
@@ -64,12 +64,6 @@
.o-align-self(center);
}
}
-
- .o_row .o_field_many2one, .o_field_many2one.oe_inline {
- &.o_with_button:not(:last-child) { // If invisible element as last child, this line has no effect but that's not very important
- margin-right: (35px + (@odoo-form-spacing-unit/2));
- }
- }
}
.o_row > div > .o_field_widget {
@@ -338,6 +332,17 @@
}
}
+ :not(.o_row) > .o_field_widget,
+ .o_row > .o_field_widget:last-child { // Note: this does not take care
+ // of an invisible last-child but
+ // it does not really matter
+ // Makes extra buttons (e.g. m2o external button) overflow on the
+ // right padding of the parent element
+ .o_input_dropdown {
+ .o-flex(1, 0, auto);
+ }
+ }
+
&.o_label_nowrap .o_form_label {
white-space: nowrap;
}
diff --git a/addons/web/static/src/less/list_view.less b/addons/web/static/src/less/list_view.less
index d84f673ab75..4a5429c6de2 100644
--- a/addons/web/static/src/less/list_view.less
+++ b/addons/web/static/src/less/list_view.less
@@ -153,9 +153,6 @@
.o_field_widget {
min-width: 0;
}
- .o_with_button .o_input_dropdown {
- width: 1%; // Hack so that the sibling button is not overlapped
- }
.o_input_dropdown, .o_datepicker {
> .o_input {
padding-right: 15px; // To prevent caret overlapping