diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-12-04 19:25:51 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-12-04 19:25:51 +0100 |
| commit | a447da75fd6f3c76aa4db80d9a83d5e56fa0854d (patch) | |
| tree | 5d19dd629b4498f16d24d20085aee391b6b06fad /addons/web | |
| parent | 863fad1b535b05e2fd61b29888f492290c1aa7a5 (diff) | |
| parent | e7d174a1422e2f8bfd849134767d5f43383599b0 (diff) | |
[MERGE] forward port branch saas-14 up to e7d174a1422
Diffstat (limited to 'addons/web')
| -rw-r--r-- | addons/web/static/src/js/views/form_widgets.js | 7 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/graph_widget.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/search_inputs.js | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/addons/web/static/src/js/views/form_widgets.js b/addons/web/static/src/js/views/form_widgets.js index 4fe6e9b31b8..a8b87210a09 100644 --- a/addons/web/static/src/js/views/form_widgets.js +++ b/addons/web/static/src/js/views/form_widgets.js @@ -1250,7 +1250,7 @@ var FieldBinaryFile = FieldBinary.extend({ this._super(); if (this.get("effective_readonly")) { this.$el.click(function(ev) { - if (self.get('value')) { + if (self.get('value') && self.view.datarecord.id) { self.on_save_as(ev); } return false; @@ -1268,6 +1268,11 @@ var FieldBinaryFile = FieldBinary.extend({ this.do_toggle(!!this.get('value')); if (this.get('value')) { this.$el.empty().append($("<span/>").addClass('fa fa-download')); + if (this.view.datarecord.id) { + this.$el.css('cursor', 'pointer'); + } else { + this.$el.css('cursor', 'not-allowed'); + } if (filename) { this.$el.append(" " + filename); } diff --git a/addons/web/static/src/js/views/graph_widget.js b/addons/web/static/src/js/views/graph_widget.js index 36908e65f6b..783428a7c7c 100644 --- a/addons/web/static/src/js/views/graph_widget.js +++ b/addons/web/static/src/js/views/graph_widget.js @@ -100,7 +100,7 @@ return Widget.extend({ })); } else { var chart = this['display_' + this.mode](); - if (chart) { + if (chart && chart.tooltip.chartContainer) { chart.tooltip.chartContainer(this.$el[0]); } } diff --git a/addons/web/static/src/js/views/search_inputs.js b/addons/web/static/src/js/views/search_inputs.js index c4478956499..6459fba77b8 100644 --- a/addons/web/static/src/js/views/search_inputs.js +++ b/addons/web/static/src/js/views/search_inputs.js @@ -152,7 +152,7 @@ var Field = Input.extend( /** @lends instance.web.search.Field# */ { if (domain) { value_to_domain = function (facetValue) { return new data.CompoundDomain(domain) - .set_eval_context({self: self.value_from(facetValue)}); + .set_eval_context({self: self.value_from(facetValue), raw_value: facetValue.attributes.value}); }; } else { value_to_domain = function (facetValue) { |
