diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-12-04 20:12:19 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-12-04 20:12:19 +0100 |
| commit | a8d01cbf4ea88f894ff927a6a5424bbb58e630d0 (patch) | |
| tree | b5f52af75dec36eac2bf44941f3c5f7d8ab3a1ed /addons/web/static/src/js | |
| parent | 3549688b21eb65e16b9c3f2b6462eb8d8b52cd47 (diff) | |
| parent | a447da75fd6f3c76aa4db80d9a83d5e56fa0854d (diff) | |
[MERGE] forward port branch saas-15 up to a447da75fd6
Diffstat (limited to 'addons/web/static/src/js')
| -rw-r--r-- | addons/web/static/src/js/chrome/search_inputs.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/fields/basic_fields.js | 7 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/graph/graph_renderer.js | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/addons/web/static/src/js/chrome/search_inputs.js b/addons/web/static/src/js/chrome/search_inputs.js index d567551873f..a2923d1a607 100644 --- a/addons/web/static/src/js/chrome/search_inputs.js +++ b/addons/web/static/src/js/chrome/search_inputs.js @@ -153,7 +153,7 @@ var Field = Input.extend( /** @lends instance.web.search.Field# */ { value_to_domain = function (facetValue) { return Domain.prototype.stringToArray( domain, - {self: self.value_from(facetValue)} + {self: self.value_from(facetValue), raw_value: facetValue.attributes.value} ); }; } else { diff --git a/addons/web/static/src/js/fields/basic_fields.js b/addons/web/static/src/js/fields/basic_fields.js index ce1a305277f..069e004c702 100644 --- a/addons/web/static/src/js/fields/basic_fields.js +++ b/addons/web/static/src/js/fields/basic_fields.js @@ -1176,7 +1176,7 @@ var FieldBinaryFile = AbstractFieldBinary.extend({ template: 'FieldBinaryFile', events: _.extend({}, AbstractFieldBinary.prototype.events, { 'click': function (event) { - if (this.mode === 'readonly' && this.value) { + if (this.mode === 'readonly' && this.value && this.recordData.id) { this.on_save_as(event); } }, @@ -1193,6 +1193,11 @@ var FieldBinaryFile = AbstractFieldBinary.extend({ this.do_toggle(!!this.value); if (this.value) { this.$el.empty().append($("<span/>").addClass('fa fa-download')); + if (this.recordData.id) { + this.$el.css('cursor', 'pointer'); + } else { + this.$el.css('cursor', 'not-allowed'); + } if (this.filename_value) { this.$el.append(" " + this.filename_value); } diff --git a/addons/web/static/src/js/views/graph/graph_renderer.js b/addons/web/static/src/js/views/graph/graph_renderer.js index 6a976c3a588..4e6c3692aad 100644 --- a/addons/web/static/src/js/views/graph/graph_renderer.js +++ b/addons/web/static/src/js/views/graph/graph_renderer.js @@ -81,7 +81,7 @@ return AbstractRenderer.extend({ setTimeout(function () { self.$el.empty(); var chart = self['_render' + _.str.capitalize(self.state.mode) + 'Chart'](); - if (chart) { + if (chart && chart.tooltip.chartContainer) { self.to_remove = chart.update; nv.utils.onWindowResize(chart.update); chart.tooltip.chartContainer(self.el); |
