diff options
| author | Christophe Matthieu <chm@odoo.com> | 2015-08-21 09:58:13 +0200 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2015-08-21 22:06:52 +0200 |
| commit | 6baf611df1064a3ae5f6368d3a35b3c3d7779543 (patch) | |
| tree | 6d6c6b51896ab3322ff205ff30dc57173f591b48 /addons/web/static/src/js/widgets | |
| parent | 5d2c3ceb028095880262f3c6fa11013f39f86c57 (diff) | |
[IMP] web: create generic controller '/web/content' and '/web/image'
Replace deprecate controllers like /web/binary/image, /web/binary/saveas...
Use ETag for all content with 'unique' option to cache the content if the content is never changed.
Diffstat (limited to 'addons/web/static/src/js/widgets')
| -rw-r--r-- | addons/web/static/src/js/widgets/sidebar.js | 8 | ||||
| -rw-r--r-- | addons/web/static/src/js/widgets/user_menu.js | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/addons/web/static/src/js/widgets/sidebar.js b/addons/web/static/src/js/widgets/sidebar.js index 9f7c46bf48d..18f488cdfec 100644 --- a/addons/web/static/src/js/widgets/sidebar.js +++ b/addons/web/static/src/js/widgets/sidebar.js @@ -174,16 +174,14 @@ var Sidebar = Widget.extend({ } }, on_attachments_loaded: function(attachments) { - var self = this; - var prefix = session.url('/web/binary/saveas', {model: 'ir.attachment', field: 'datas', filename_field: 'name'}); _.each(attachments,function(a) { a.label = a.name; if(a.type === "binary") { - a.url = prefix + '&id=' + a.id + '&t=' + (new Date().getTime()); + a.url = '/web/content/' + a.id + '?download=true&t=' + (new Date().getTime()); } }); - self.items.files = attachments; - self.redraw(); + this.items.files = attachments; + this.redraw(); this.$('.oe_sidebar_add_attachment .oe_form_binary_file').change(this.on_attachment_changed); this.$el.find('.oe_sidebar_delete_item').click(this.on_attachment_delete); }, diff --git a/addons/web/static/src/js/widgets/user_menu.js b/addons/web/static/src/js/widgets/user_menu.js index 94a47cfa4b0..9111a9a34ba 100644 --- a/addons/web/static/src/js/widgets/user_menu.js +++ b/addons/web/static/src/js/widgets/user_menu.js @@ -47,7 +47,7 @@ var SystrayMenu = Widget.extend({ if (!session.debug) { topbar_name = _.str.sprintf("%s (%s)", topbar_name, session.db); } - var avatar_src = session.url('/web/binary/image', {model:'res.users', field: 'image_small', id: session.uid}); + var avatar_src = session.url('/web/image', {model:'res.users', field: 'image_small', id: session.uid}); $avatar.attr('src', avatar_src); core.bus.trigger('resize'); // Re-trigger the reflow logic |