Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2020-02-19 00:27:22 +0300
committerJulius Härtl <jus@bitgrid.net>2020-02-19 00:27:22 +0300
commitfd2cfce4178a63dd319075b912345706a8a32970 (patch)
tree664e46e682a356ef83754a3f9f371e098cf12ec5 /apps
parent3be571cd0520537e154332a4508da4e2f98af5d7 (diff)
Show user/displayname when backend does not offer saving
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'apps')
-rw-r--r--apps/settings/src/components/UserList/UserRow.vue43
1 files changed, 23 insertions, 20 deletions
diff --git a/apps/settings/src/components/UserList/UserRow.vue b/apps/settings/src/components/UserList/UserRow.vue
index 0fe438752ee..f2f44d2e7c1 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"