From 8e24f368e5f550c76101ba5c83c4b04b1d81ccba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Tue, 18 Feb 2020 22:47:00 +0100
Subject: [PATCH] Also fix actions overlay in editing and new user rows
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 apps/settings/src/components/UserList.vue             |  5 +++++
 apps/settings/src/components/UserList/UserRow.vue     | 11 ++++++-----
 .../src/components/UserList/UserRowSimple.vue         |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/apps/settings/src/components/UserList.vue b/apps/settings/src/components/UserList.vue
index 15462a1e7ae..37b510e2079 100644
--- a/apps/settings/src/components/UserList.vue
+++ b/apps/settings/src/components/UserList.vue
@@ -575,3 +575,8 @@ export default {
 	},
 }
 </script>
+<style scoped>
+	.row::v-deep .multiselect__single {
+		z-index: auto !important;
+	}
+</style>
diff --git a/apps/settings/src/components/UserList/UserRow.vue b/apps/settings/src/components/UserList/UserRow.vue
index c0ff129e137..d0787b2d0e3 100644
--- a/apps/settings/src/components/UserList/UserRow.vue
+++ b/apps/settings/src/components/UserList/UserRow.vue
@@ -224,11 +224,12 @@
 						{{ t('settings', 'Done') }}
 					</ActionButton>
 				</Actions>
-				<div v-click-outside="hideMenu"
-					class="icon-more"
-					@click="toggleMenu" />
-				<div :class="{ 'open': openedMenu }" class="popovermenu">
-					<PopoverMenu :menu="userActions" />
+				<div class="userPopoverMenuWrapper" v-click-outside="hideMenu">
+					<div class="icon-more"
+						@click="toggleMenu" />
+					<div :class="{ 'open': openedMenu }" class="popovermenu">
+						<PopoverMenu :menu="userActions" />
+					</div>
 				</div>
 			</div>
 			<div :style="{opacity: feedbackMessage !== '' ? 1 : 0}"
diff --git a/apps/settings/src/components/UserList/UserRowSimple.vue b/apps/settings/src/components/UserList/UserRowSimple.vue
index f56507c0a2f..255043c21db 100644
--- a/apps/settings/src/components/UserList/UserRowSimple.vue
+++ b/apps/settings/src/components/UserList/UserRowSimple.vue
@@ -61,7 +61,7 @@
 						{{ t('settings', 'Edit User') }}
 					</ActionButton>
 				</Actions>
-				<div style="position: relative;">
+				<div class="userPopoverMenuWrapper">
 					<div v-click-outside="hideMenu" class="icon-more" @click="$emit('toggleMenu')" />
 					<div class="popovermenu" :class="{ 'open': openedMenu }">
 						<PopoverMenu :menu="userActions" />