From 4a748da4b0aa0c1460804337ce6a4068808689b8 Mon Sep 17 00:00:00 2001 From: Yannick Tivisse Date: Thu, 27 Jun 2019 16:00:57 +0200 Subject: [PATCH 001/110] [FIX] hr: Correct implementation for 3be372c --- addons/hr/models/res_users.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/hr/models/res_users.py b/addons/hr/models/res_users.py index 499586befcf..ba13e835312 100644 --- a/addons/hr/models/res_users.py +++ b/addons/hr/models/res_users.py @@ -116,7 +116,8 @@ class User(models.Model): # However, in this case, we want the user to be able to read/write its own data, # even if they are protected by groups. # We make the front-end aware of those fields by sending all field definitions. - if not self.env.user.share: + profile_view = self.env.ref("hr.res_users_view_form_profile") + if profile_view and view_id == profile_view.id: self = self.sudo() return super(User, self).fields_view_get(view_id=view_id, view_type=view_type, toolbar=toolbar, submenu=submenu) From 798aa51a00592427e332c7638956b2406f2d7b87 Mon Sep 17 00:00:00 2001 From: mgh-odoo Date: Fri, 14 Jun 2019 08:46:31 +0000 Subject: [PATCH 002/110] [FIX] website_{profile, forum}: migrate events from forum to profile After this commit https://github.com/odoo/odoo/commit/ff870099c588e56 some of the events are left in website_forum, that caused some buttons to be inactive. In order to fix that events moved to website_profile. Note: code is moved as it is. Cleaning class / namespace will be done in master to avoid issues due to stable version. Related to task 2006045 closes odoo/odoo#34138 Signed-off-by: Thibault Delavallee (tde) --- .../static/src/js/website_forum.js | 40 ------------------- .../static/src/js/website_profile.js | 40 +++++++++++++++++++ .../website_profile/views/website_profile.xml | 10 ++--- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/addons/website_forum/static/src/js/website_forum.js b/addons/website_forum/static/src/js/website_forum.js index 9acf9965982..900f6d9ccd0 100644 --- a/addons/website_forum/static/src/js/website_forum.js +++ b/addons/website_forum/static/src/js/website_forum.js @@ -17,9 +17,6 @@ sAnimations.registry.websiteForum = sAnimations.Class.extend({ 'click .karma_required': '_onKarmaRequiredClick', 'mouseenter .o_js_forum_tag_follow': '_onTagFollowBoxMouseEnter', 'mouseleave .o_js_forum_tag_follow': '_onTagFollowBoxMouseLeave', - 'click .o_forum_profile_pic_edit': '_onEditProfilePicClick', - 'change .o_forum_file_upload': '_onFileUploadChange', - 'click .o_forum_profile_pic_clear': '_onProfilePicClearClick', 'mouseenter .o_forum_user_info': '_onUserInfoMouseEnter', 'mouseleave .o_forum_user_info': '_onUserInfoMouseLeave', 'mouseleave .o_forum_user_bio_expand': '_onUserBioExpandMouseLeave', @@ -210,43 +207,6 @@ sAnimations.registry.websiteForum = sAnimations.Class.extend({ _onTagFollowBoxMouseLeave: function (ev) { $(ev.currentTarget).find('.o_forum_tag_follow_box').stop().fadeOut().css('display', 'none'); }, - /** - * @private - * @param {Event} ev - */ - _onEditProfilePicClick: function (ev) { - ev.preventDefault(); - $(ev.currentTarget).closest('form').find('.o_forum_file_upload').trigger('click'); - }, - /** - * @private - * @param {Event} ev - */ - _onFileUploadChange: function (ev) { - if (!ev.currentTarget.files.length) { - return; - } - var $form = $(ev.currentTarget).closest('form'); - var reader = new window.FileReader(); - reader.onload = function (ev) { - $form.find('.o_forum_avatar_img').attr('src', ev.target.result); - }; - reader.readAsDataURL(ev.currentTarget.files[0]); - $form.find('#forum_clear_image').remove(); - }, - /** - * @private - * @param {Event} ev - */ - _onProfilePicClearClick: function (ev) { - var $form = $(ev.currentTarget).closest('form'); - $form.find('.o_forum_avatar_img').attr('src', '/web/static/src/img/placeholder.png'); - $form.append($('', { - name: 'clear_image', - id: 'forum_clear_image', - type: 'hidden', - })); - }, /** * @private * @param {Event} ev diff --git a/addons/website_profile/static/src/js/website_profile.js b/addons/website_profile/static/src/js/website_profile.js index 48d033d30fe..839145225bf 100644 --- a/addons/website_profile/static/src/js/website_profile.js +++ b/addons/website_profile/static/src/js/website_profile.js @@ -46,6 +46,9 @@ sAnimations.registry.websiteProfile = sAnimations.Class.extend({ sAnimations.registry.websiteProfileEditor = sAnimations.Class.extend({ selector: '.o_wprofile_editor_form', read_events: { + 'click .o_forum_profile_pic_edit': '_onEditProfilePicClick', + 'change .o_forum_file_upload': '_onFileUploadChange', + 'click .o_forum_profile_pic_clear': '_onProfilePicClearClick', 'click .o_wprofile_submit_btn': '_onSubmitClick', }, @@ -76,6 +79,43 @@ sAnimations.registry.websiteProfileEditor = sAnimations.Class.extend({ // Handlers //-------------------------------------------------------------------------- + /** + * @private + * @param {Event} ev + */ + _onEditProfilePicClick: function (ev) { + ev.preventDefault(); + $(ev.currentTarget).closest('form').find('.o_forum_file_upload').trigger('click'); + }, + /** + * @private + * @param {Event} ev + */ + _onFileUploadChange: function (ev) { + if (!ev.currentTarget.files.length) { + return; + } + var $form = $(ev.currentTarget).closest('form'); + var reader = new window.FileReader(); + reader.readAsDataURL(ev.currentTarget.files[0]); + reader.onload = function (ev) { + $form.find('.o_forum_avatar_img').attr('src', ev.target.result); + }; + $form.find('#forum_clear_image').remove(); + }, + /** + * @private + * @param {Event} ev + */ + _onProfilePicClearClick: function (ev) { + var $form = $(ev.currentTarget).closest('form'); + $form.find('.o_forum_avatar_img').attr('src', '/web/static/src/img/placeholder.png'); + $form.append($('', { + name: 'clear_image', + id: 'forum_clear_image', + type: 'hidden', + })); + }, /** * @private */ diff --git a/addons/website_profile/views/website_profile.xml b/addons/website_profile/views/website_profile.xml index 3060431e87f..0cd047fa31b 100644 --- a/addons/website_profile/views/website_profile.xml +++ b/addons/website_profile/views/website_profile.xml @@ -97,20 +97,20 @@