diff options
| author | Robot Odoo <xmo+roboto@odoo.com> | 2019-08-02 20:36:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-02 20:36:51 +0200 |
| commit | 6df11fc42d965940e3dcdd64b5a197a60bb6f4e4 (patch) | |
| tree | eee38b8192d49fc2c3525b5ce21b80d9d3acc500 /addons/web/static | |
| parent | ec32fd54595614ee8763ba82c5862d79a3e21897 (diff) | |
| parent | 45e3be94c0095b0814690de3cac9ab56afe32368 (diff) | |
[MERGE] *: rename image fields and use image.mixin
Merge commit for PR #34925
Related enterprise PR odoo/enterprise/pull/4865
The goal is to:
- Use `image.mixin` on the models currently storing multiple image sizes.
- Create Image field and use it on models where mixin is overkill.
- Rename the image fields to contain the pixel number in the name.
- Add 512 size.
- Clean up `image.mixin`, zoom field, variant fields.
Note: models that currently store only a single size image will not be changed
in this PR.
Signed-off-by: Jérémy Kersten (jke) <jke@openerp.com>
Diffstat (limited to 'addons/web/static')
| -rw-r--r-- | addons/web/static/src/js/chrome/user_menu.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/fields/basic_fields.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/calendar/calendar_view.js | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/addons/web/static/src/js/chrome/user_menu.js b/addons/web/static/src/js/chrome/user_menu.js index c2d19b7a879..3b93bbd9c3b 100644 --- a/addons/web/static/src/js/chrome/user_menu.js +++ b/addons/web/static/src/js/chrome/user_menu.js @@ -46,7 +46,7 @@ var UserMenu = Widget.extend({ self.$('.oe_topbar_name').text(topbar_name); var avatar_src = session.url('/web/image', { model:'res.users', - field: 'image_small', + field: 'image_64', id: session.uid, }); $avatar.attr('src', avatar_src); diff --git a/addons/web/static/src/js/fields/basic_fields.js b/addons/web/static/src/js/fields/basic_fields.js index 322168a7241..dbafc45e592 100644 --- a/addons/web/static/src/js/fields/basic_fields.js +++ b/addons/web/static/src/js/fields/basic_fields.js @@ -1833,7 +1833,7 @@ var FieldBinaryImage = AbstractFieldBinary.extend({ this.$el.addClass(this.attrs.class); } - var urlThumb = this._getImageUrl(this.model, this.res_id, 'image_medium', unique); + var urlThumb = this._getImageUrl(this.model, this.res_id, 'image_128', unique); this.$el.empty(); $img = this.$el; diff --git a/addons/web/static/src/js/views/calendar/calendar_view.js b/addons/web/static/src/js/views/calendar/calendar_view.js index 2ee927a4af0..af4a0baa2ec 100644 --- a/addons/web/static/src/js/views/calendar/calendar_view.js +++ b/addons/web/static/src/js/views/calendar/calendar_view.js @@ -103,7 +103,7 @@ var CalendarView = AbstractView.extend({ }; if (fields[fieldName].relation) { if (['res.users', 'res.partner'].indexOf(fields[fieldName].relation) !== -1) { - filters[fieldName].avatar_field = 'image_small'; + filters[fieldName].avatar_field = 'image_64'; } filters[fieldName].avatar_model = fields[fieldName].relation; } |
