summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/css/base.css4
-rw-r--r--addons/web/static/src/css/base.sass2
-rw-r--r--addons/web/static/src/js/action_manager.js3
-rw-r--r--addons/web/static/src/js/boot.js23
-rw-r--r--addons/web/static/src/js/framework/misc.js2
-rw-r--r--addons/web/static/src/js/views/graph_view.js4
-rw-r--r--addons/web/static/src/js/views/list_view_editable.js2
-rw-r--r--addons/web/static/src/js/widgets/data_export.js1
-rw-r--r--addons/web/static/src/less/utils.less9
-rw-r--r--addons/web/static/src/xml/base.xml12
10 files changed, 38 insertions, 24 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index fddbbe25800..1b8851f7b69 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2165,11 +2165,11 @@
opacity: 0;
display: block !important;
}
-.openerp .oe_list.oe_list_editable.oe_editing .oe_edition .oe_list_field_cell {
+.openerp .oe_list.oe_list_editable.oe_editing .oe_edition .oe_list_field_cell:not(.oe-button) {
color: transparent;
text-shadow: none;
}
-.openerp .oe_list.oe_list_editable.oe_editing .oe_edition .oe_list_field_cell * {
+.openerp .oe_list.oe_list_editable.oe_editing .oe_edition .oe_list_field_cell:not(.oe-button) * {
visibility: hidden;
}
.openerp .oe_list.oe_list_editable.oe_editing .oe_m2o_drop_down_button {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index f82d77c624c..814f0a5865a 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1866,7 +1866,7 @@ $sheet-padding: 16px
opacity: 0
display: block !important
.oe_list.oe_list_editable.oe_editing
- .oe_edition .oe_list_field_cell
+ .oe_edition .oe_list_field_cell:not(.oe-button)
*
visibility: hidden
color: transparent
diff --git a/addons/web/static/src/js/action_manager.js b/addons/web/static/src/js/action_manager.js
index 2337583b7f9..5eb5aaa9891 100644
--- a/addons/web/static/src/js/action_manager.js
+++ b/addons/web/static/src/js/action_manager.js
@@ -180,6 +180,9 @@ var ViewManagerAction = WidgetAction.extend({
* @return {jQuery} the view_manager's $el
*/
detach: function() {
+ // Hack to remove badly inserted nvd3 tooltips ; should be removed when upgrading nvd3 lib
+ $('body > .nvtooltip').remove();
+
return this.widget.$el.detach();
},
/**
diff --git a/addons/web/static/src/js/boot.js b/addons/web/static/src/js/boot.js
index 77115499b46..34abca7ef03 100644
--- a/addons/web/static/src/js/boot.js
+++ b/addons/web/static/src/js/boot.js
@@ -203,23 +203,28 @@
function process_job (job) {
var require = make_require(job);
+
+ var job_exec;
+ var def = $.Deferred();
try {
- var def = $.Deferred();
- $.when(job.factory.call(null, require)).then(
+ job_exec = job.factory.call(null, require);
+ jobs.splice(jobs.indexOf(job), 1);
+ job_deferred.push(def);
+ } catch (e) {
+ job.error = e;
+ }
+ if (!job.error) {
+ $.when(job_exec).then(
function (data) {
services[job.name] = data;
- clearTimeout(time);
- time = _.defer(odoo.process_jobs, jobs, services);
def.resolve();
+ odoo.process_jobs(jobs, services);
}, function (e) {
job.rejected = e || true;
jobs.push(job);
def.resolve();
- });
- jobs.splice(jobs.indexOf(job), 1);
- job_deferred.push(def);
- } catch (e) {
- job.error = e;
+ }
+ );
}
}
diff --git a/addons/web/static/src/js/framework/misc.js b/addons/web/static/src/js/framework/misc.js
index fd6bb6d6288..25e80c33e84 100644
--- a/addons/web/static/src/js/framework/misc.js
+++ b/addons/web/static/src/js/framework/misc.js
@@ -93,12 +93,14 @@ function blockUI () {
var throbber = new Throbber();
throbbers.push(throbber);
throbber.appendTo($(".oe_blockui_spin_container"));
+ $('body').addClass('o_ui_blocked');
return tmp;
}
function unblockUI () {
_.invoke(throbbers, 'destroy');
throbbers = [];
+ $('body').removeClass('o_ui_blocked');
return $.unblockUI.apply($, arguments);
}
diff --git a/addons/web/static/src/js/views/graph_view.js b/addons/web/static/src/js/views/graph_view.js
index f8f1bba909a..8a604640fc9 100644
--- a/addons/web/static/src/js/views/graph_view.js
+++ b/addons/web/static/src/js/views/graph_view.js
@@ -19,10 +19,6 @@ var GraphView = View.extend({
icon: 'fa-bar-chart',
view_type: 'graph',
- on_detach_callback: function () {
- $('body > .nvtooltip').remove();
- },
-
init: function(parent, dataset, view_id, options) {
this._super(parent, dataset, view_id, options);
diff --git a/addons/web/static/src/js/views/list_view_editable.js b/addons/web/static/src/js/views/list_view_editable.js
index 9a38d27e050..2bd6dc1ab25 100644
--- a/addons/web/static/src/js/views/list_view_editable.js
+++ b/addons/web/static/src/js/views/list_view_editable.js
@@ -420,7 +420,7 @@ ListView.include(/** @lends instance.web.ListView# */{
*/
resize_field: function (field, cell) {
var $cell = $(cell);
- field.set_dimensions($cell.outerHeight(), $cell.outerWidth()-3); // -3 to have a gap between fields
+ field.set_dimensions($cell.outerHeight(), $cell.outerWidth());
field.$el.addClass('o_temp_visible').css({top: 0, left: 0}).position({
my: 'left top',
at: 'left top',
diff --git a/addons/web/static/src/js/widgets/data_export.js b/addons/web/static/src/js/widgets/data_export.js
index 57159732ad6..a73020ce9b2 100644
--- a/addons/web/static/src/js/widgets/data_export.js
+++ b/addons/web/static/src/js/widgets/data_export.js
@@ -388,6 +388,7 @@ var DataExport = Dialog.extend({
},
add_field: function(field_id, string) {
var field_list = this.$el.find('#fields_list');
+ field_id = this.records[field_id] || field_id;
if (this.$el.find("#fields_list option[value='" + field_id + "']")
&& !this.$el.find("#fields_list option[value='" + field_id + "']").length) {
field_list.append(new Option(string, field_id));
diff --git a/addons/web/static/src/less/utils.less b/addons/web/static/src/less/utils.less
index da69e2c0aa9..22a4d0f4ffd 100644
--- a/addons/web/static/src/less/utils.less
+++ b/addons/web/static/src/less/utils.less
@@ -217,6 +217,15 @@
}
// ------------------------------------------------------------------
+// Columns
+// ------------------------------------------------------------------
+.o-columns(@width: auto, @col: auto) {
+ -webkit-columns: @width @col;
+ -moz-columns: @width @col;
+ columns: @width @col;
+}
+
+// ------------------------------------------------------------------
// Position absolute
// ------------------------------------------------------------------
.o-position-absolute(@top: auto, @right: auto, @bottom: auto, @left: auto) {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index a8c24000c6b..f4e7e45740f 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1437,13 +1437,11 @@
<t t-name="FieldMany2ManyCheckBoxes">
<t t-foreach="widget.get('records')" t-as="record">
<div>
- <t t-if="widget.get('value').indexOf(record[0]) !== -1">
- <input type="checkbox" t-att-data-record-id="JSON.stringify(record[0])" checked="true"/>
- </t>
- <t t-if="widget.get('value').indexOf(record[0]) === -1">
- <input type="checkbox" t-att-data-record-id="JSON.stringify(record[0])"/>
- </t>
- <t t-esc="record[1]"/>
+ <label style="font-weight: normal">
+ <input type="checkbox" t-att-data-record-id="JSON.stringify(record[0])"
+ t-att-checked="(widget.get('value').indexOf(record[0]) !== -1) or null"/>
+ <t t-esc="record[1]"/>
+ </label>
</div>
</t>
</t>
generated by cgit v1.2.3 (git 2.25.1) at 2026-10-23 22:26:01 +0000