Skip to content

Commit 8c223b6

Browse files
authored
Merge pull request #50820 from nextcloud/fix/public-share-expiration
fix(files_sharing): Fix public share expiration being set when toggle is not enabled
2 parents 082e85f + 77edb25 commit 8c223b6

File tree

9 files changed

+14
-9
lines changed

9 files changed

+14
-9
lines changed

apps/files_sharing/src/components/SharingEntryLink.vue

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
:checked.sync="defaultExpirationDateEnabled"
8787
:disabled="pendingEnforcedExpirationDate || saving"
8888
class="share-link-expiration-date-checkbox"
89-
@change="onExpirationDateToggleChange">
89+
@update:model-value="onExpirationDateToggleUpdate">
9090
{{ config.isDefaultExpireDateEnforced ? t('files_sharing', 'Enable link expiration (enforced)') : t('files_sharing', 'Enable link expiration') }}
9191
</NcActionCheckbox>
9292

@@ -875,9 +875,14 @@ export default {
875875
this.onPasswordSubmit()
876876
this.onNoteSubmit()
877877
},
878-
onExpirationDateToggleChange(enabled) {
878+
879+
/**
880+
* @param enabled True if expiration is enabled
881+
*/
882+
onExpirationDateToggleUpdate(enabled) {
879883
this.share.expireDate = enabled ? this.formatDateToString(this.config.defaultExpirationDate) : ''
880884
},
885+
881886
expirationDateChanged(event) {
882887
const date = event.target.value
883888
this.onExpirationChange(date)

dist/1031-1031.js.map

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

dist/1031-1031.js.map.license

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/9699-9699.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/9699-9699.js.map.license

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9699-9699.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.

dist/files_sharing-files_sharing_tab.js.map

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

0 commit comments

Comments
 (0)