Skip to content

Commit

Permalink
fix(transferownership): allow searching by email, display user.shareW…
Browse files Browse the repository at this point in the history
…ithDisplayNameUnique in item subline, adjust style

Signed-off-by: Julien Veyssier <[email protected]>

[skip ci]

Signed-off-by: Julien Veyssier <[email protected]>
  • Loading branch information
julien-nc committed Feb 17, 2025
1 parent 0319467 commit 68365df
Showing 1 changed file with 7 additions and 14 deletions.
21 changes: 7 additions & 14 deletions apps/files/src/components/TransferOwnershipDialogue.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<form @submit.prevent="submit">
<p class="transfer-select-row">
<span>{{ readableDirectory }}</span>
<NcButton v-if="directory === undefined"
<NcButton v-if="directory === undefined"
class="transfer-select-row__choose_button"
@click.prevent="start">
{{ t('files', 'Choose file or folder to transfer') }}
Expand All @@ -34,7 +34,7 @@
{{ t('files', 'Change') }}
</NcButton>
</p>
<p class="new-owner-row">
<p class="new-owner">
<label for="targetUser">
<span>{{ t('files', 'New owner') }}</span>
</label>
Expand All @@ -43,9 +43,7 @@
:options="formatedUserSuggestions"
:multiple="false"
:loading="loadingUsers"
label="displayName"
:user-select="true"
class="middle-align"
@search="findUserDebounced" />
</p>
<p>
Expand Down Expand Up @@ -106,6 +104,7 @@ export default {
user: user.uid,
displayName: user.displayName,
icon: 'icon-user',
subname: user.shareWithDisplayNameUnique,
}
})
},
Expand Down Expand Up @@ -172,6 +171,7 @@ export default {
Vue.set(this.userSuggestions, user.value.shareWith, {
uid: user.value.shareWith,
displayName: user.label,
shareWithDisplayNameUnique: user.shareWithDisplayNameUnique,
})
})
} catch (error) {
Expand Down Expand Up @@ -219,16 +219,14 @@ export default {
</script>

<style scoped lang="scss">
.middle-align {
vertical-align: middle;
}
p {
margin-top: 12px;
margin-bottom: 12px;
}
.new-owner-row {
.new-owner {
display: flex;
flex-wrap: wrap;
flex-direction: column;
max-width: 400px;

label {
display: flex;
Expand All @@ -239,11 +237,6 @@ p {
margin-right: 8px;
}
}

.multiselect {
flex-grow: 1;
max-width: 280px;
}
}
.transfer-select-row {
span {
Expand Down

0 comments on commit 68365df

Please sign in to comment.