From e70045f7d303fd0c6354f583a0016d94b1d49bb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 10 Jan 2018 10:54:12 +0100 Subject: [PATCH] Hide "no actions" from current users avatar menu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- js/directive/avatar.js | 2 +- js/directive/contactsmenudelete.js | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/js/directive/avatar.js b/js/directive/avatar.js index c93165985..6138a1c1f 100644 --- a/js/directive/avatar.js +++ b/js/directive/avatar.js @@ -33,7 +33,7 @@ app.directive('avatar', function() { scope.displayname = attr.displayname; var value = attr.user; var avatardiv = $(element).find('.avatardiv'); - if(typeof attr.contactsmenu !== 'undefined' && attr.contactsmenu !== 'false' && oc_current_user !== value) { + if(typeof attr.contactsmenu !== 'undefined' && attr.contactsmenu !== 'false') { avatardiv.contactsMenu(value, 0, $(element)); avatardiv.addClass('has-contactsmenu'); } diff --git a/js/directive/contactsmenudelete.js b/js/directive/contactsmenudelete.js index 8fdbac5ef..b0041b46c 100644 --- a/js/directive/contactsmenudelete.js +++ b/js/directive/contactsmenudelete.js @@ -28,6 +28,9 @@ app.directive('contactsmenudelete', function() { link: function(scope, element, attr){ var user = attr.user; var menu = $(element).parent().find('.contactsmenu-popover'); + if (oc_current_user === user) { + menu.children(':first').remove(); + } var menuEntry = $('
  • ' + t('deck', 'Remove user from card') + '
  • '); menuEntry.on('click', function () { scope.removeAssignedUser(user);