Skip to content

Commit 7d99b04

Browse files
authored
Merge pull request #52849 from nextcloud/backport/52813/stable31
[stable31] fix(files_sharing): Show note if note exists on share
2 parents 4faf511 + ad7a6b0 commit 7d99b04

File tree

11 files changed

+10
-10
lines changed

11 files changed

+10
-10
lines changed

apps/files_sharing/src/views/SharingDetailsTab.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -905,8 +905,9 @@ export default {
905905
this.advancedSectionAccordionExpanded = true
906906
}
907907
908-
if (this.share.note) {
908+
if (this.isValidShareAttribute(this.share.note)) {
909909
this.writeNoteToRecipientIsChecked = true
910+
this.advancedSectionAccordionExpanded = true
910911
}
911912
912913
},

cypress/e2e/files_sharing/note-to-recipient.cy.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,6 @@ describe('files_sharing: Note to recipient', { testIsolation: true }, () => {
8080
cy.get('[data-cy-sidebar]').within(() => {
8181
// Open the share
8282
cy.get('[data-cy-files-sharing-share-actions]').first().click({ force: true })
83-
// Open the custom settings
84-
cy.get('[data-cy-files-sharing-share-permissions-bundle="custom"]').click()
8583

8684
cy.findByRole('checkbox', { name: /note to recipient/i })
8785
.and('be.checked')
@@ -90,4 +88,5 @@ describe('files_sharing: Note to recipient', { testIsolation: true }, () => {
9088
.and('have.value', 'Hello, this is the note.')
9189
})
9290
})
91+
9392
})

dist/3421-3421.js

Lines changed: 0 additions & 2 deletions
This file was deleted.

dist/3421-3421.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

dist/3421-3421.js.map.license

Lines changed: 0 additions & 1 deletion
This file was deleted.

dist/923-923.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.

dist/923-923.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/923-923.js.map.license

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
923-923.js.license

dist/files_sharing-files_sharing_tab.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)