upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-22 14:50:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 53

Merge pull request #34925 from nextcloud/backport/34871/stable25

Browse source 
[stable25] Fix visibility of internal expire date
This commit is contained in:
Vincent Petry 2022-11-04 17:15:35 +01:00 committed by GitHub
commit 3289739110
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/files_sharing/src/components/SharingEntry.vue
View file

@ -374,11 +374,14 @@ export default {
return this.config.isDefaultInternalExpireDateEnforced || !!this.share.expireDate
},
set(enabled) {
let defaultExpirationDate = this.config.defaultInternalExpirationDate
if (!defaultExpirationDate) {
defaultExpirationDate = new Date()
}
this.share.expireDate = enabled
? this.config.defaultInternalExpirationDate !== ''
? this.config.defaultInternalExpirationDate
: new Date()
? defaultExpirationDate
: ''
console.debug('Expiration date status', enabled, this.share.expireDate)
},
},

4
dist/files_sharing-files_sharing_tab.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/files_sharing-files_sharing_tab.js.map vendored
View file

File diff suppressed because one or more lines are too long