From f2cd93584f51ab7aeb762657cfac4602310d7c74 Mon Sep 17 00:00:00 2001
From: Julius Härtl <jus@bitgrid.net>
Date: Tue, 18 Feb 2020 22:27:22 +0100
Subject: Show user/displayname when backend does not offer saving
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/UserRow.vue | 43 ++++++++++++-----------
 1 file changed, 23 insertions(+), 20 deletions(-)

(limited to 'apps/settings/src')

diff --git a/apps/settings/src/components/UserList/UserRow.vue b/apps/settings/src/components/UserList/UserRow.vue
index e7c039376f5..201ab8b7728 100644
--- a/apps/settings/src/components/UserList/UserRow.vue
+++ b/apps/settings/src/components/UserList/UserRow.vue
@@ -76,32 +76,35 @@
 				width="32">
 		</div>
 		<!-- dirty hack to ellipsis on two lines -->
-		<div class="displayName">
+		<div v-if="user.backendCapabilities.setDisplayName" class="displayName">
 			<form
 				:class="{'icon-loading-small': loading.displayName}"
 				class="displayName"
 				@submit.prevent="updateDisplayName">
-				<template v-if="user.backendCapabilities.setDisplayName">
-					<input v-if="user.backendCapabilities.setDisplayName"
-						:id="'displayName'+user.id+rand"
-						ref="displayName"
-						:disabled="loading.displayName||loading.all"
-						:value="user.displayname"
-						autocapitalize="off"
-						autocomplete="new-password"
-						autocorrect="off"
-						spellcheck="false"
-						type="text">
-					<input v-if="user.backendCapabilities.setDisplayName"
-						class="icon-confirm"
-						type="submit"
-						value="">
-				</template>
-				<div v-else
-					v-tooltip.auto="t('settings', 'The backend does not support changing the display name')"
-					class="name" />
+				<input
+					:id="'displayName'+user.id+rand"
+					ref="displayName"
+					:disabled="loading.displayName||loading.all"
+					:value="user.displayname"
+					autocapitalize="off"
+					autocomplete="off"
+					autocorrect="off"
+					spellcheck="false"
+					type="text">
+				<input
+					class="icon-confirm"
+					type="submit"
+					value="">
 			</form>
 		</div>
+		<div v-else class="name">
+			{{ user.id }}
+			<div class="displayName subtitle">
+				<div v-tooltip="user.displayname.length > 20 ? user.displayname : ''" class="cellText">
+					{{ user.displayname }}
+				</div>
+			</div>
+		</div>
 		<form v-if="settings.canChangePassword && user.backendCapabilities.setPassword"
 			:class="{'icon-loading-small': loading.password}"
 			class="password"
-- 
cgit v1.2.3