Merge pull request #382 from nextcloud/small-prerelease-fixes

Small fixes
nextcloud · Jan 12, 2018 · ce3e979 · ce3e979
2 parents 4ec2ae2 + e70045f
commit ce3e979
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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 = $('<li><a><span class="icon icon-delete"></span><span>' + t('deck', 'Remove user from card') + '</span></a></li>');
 			menuEntry.on('click', function () {
 				scope.removeAssignedUser(user);

diff --git a/templates/part.boardlist.php b/templates/part.boardlist.php
@@ -80,7 +80,7 @@
 					<span class="icon icon-close" ng-click="boardUpdateReset(b)" title="<?php p($l->t('Reset')); ?>"><span class="hidden-visually"><?php p($l->t('Reset')); ?></span></span>
 				</div>
 				<div class="app-popover-menu-utils" ng-if="b.deletedAt > 0">
-					<button class="icon icon-history button-inline" ng-click="boardDeleteUndo(b)" title="Undo board deletion - Otherwise the board will be deleted during the next cronjob run."><span class="hidden-visually"><?php p($l->t('Undo board deletion - Otherwise the board will be deleted during the next cronjob run.')); ?></span></button>
+					<button class="icon icon-history button-inline" ng-click="boardDeleteUndo(b)" title="<?php p($l->t('Undo board deletion - Otherwise the board will be deleted during the next cronjob run.')); ?>"><span class="hidden-visually"><?php p($l->t('Undo board deletion - Otherwise the board will be deleted during the next cronjob run.')); ?></span></button>
 				</div>
 			</td>
 		</tr>