Skip to content

Commit 68365df

Browse files
committed
fix(transferownership): allow searching by email, display user.shareWithDisplayNameUnique in item subline, adjust style
Signed-off-by: Julien Veyssier <[email protected]> [skip ci] Signed-off-by: Julien Veyssier <[email protected]>
1 parent 0319467 commit 68365df

1 file changed

Lines changed: 7 additions & 14 deletions

File tree

apps/files/src/components/TransferOwnershipDialogue.vue

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<form @submit.prevent="submit">
2626
<p class="transfer-select-row">
2727
<span>{{ readableDirectory }}</span>
28-
<NcButton v-if="directory === undefined"
28+
<NcButton v-if="directory === undefined"
2929
class="transfer-select-row__choose_button"
3030
@click.prevent="start">
3131
{{ t('files', 'Choose file or folder to transfer') }}
@@ -34,7 +34,7 @@
3434
{{ t('files', 'Change') }}
3535
</NcButton>
3636
</p>
37-
<p class="new-owner-row">
37+
<p class="new-owner">
3838
<label for="targetUser">
3939
<span>{{ t('files', 'New owner') }}</span>
4040
</label>
@@ -43,9 +43,7 @@
4343
:options="formatedUserSuggestions"
4444
:multiple="false"
4545
:loading="loadingUsers"
46-
label="displayName"
4746
:user-select="true"
48-
class="middle-align"
4947
@search="findUserDebounced" />
5048
</p>
5149
<p>
@@ -106,6 +104,7 @@ export default {
106104
user: user.uid,
107105
displayName: user.displayName,
108106
icon: 'icon-user',
107+
subname: user.shareWithDisplayNameUnique,
109108
}
110109
})
111110
},
@@ -172,6 +171,7 @@ export default {
172171
Vue.set(this.userSuggestions, user.value.shareWith, {
173172
uid: user.value.shareWith,
174173
displayName: user.label,
174+
shareWithDisplayNameUnique: user.shareWithDisplayNameUnique,
175175
})
176176
})
177177
} catch (error) {
@@ -219,16 +219,14 @@ export default {
219219
</script>
220220
221221
<style scoped lang="scss">
222-
.middle-align {
223-
vertical-align: middle;
224-
}
225222
p {
226223
margin-top: 12px;
227224
margin-bottom: 12px;
228225
}
229-
.new-owner-row {
226+
.new-owner {
230227
display: flex;
231-
flex-wrap: wrap;
228+
flex-direction: column;
229+
max-width: 400px;
232230
233231
label {
234232
display: flex;
@@ -239,11 +237,6 @@ p {
239237
margin-right: 8px;
240238
}
241239
}
242-
243-
.multiselect {
244-
flex-grow: 1;
245-
max-width: 280px;
246-
}
247240
}
248241
.transfer-select-row {
249242
span {

0 commit comments

Comments
 (0)