Browse Source

Check expiry enforcement for all share types

We should check that a maximum expiry date has been enforced for
all shares and NOT JUST FOR internal shares before enforcing a UI max date,
like in commit 9757e680e2

Signed-off-by: fenn-cs <fenn25.fn@gmail.com>
pull/40933/head
fenn-cs 3 years ago
parent
commit
92417cd594
  1. 14
      apps/files_sharing/src/views/SharingDetailsTab.vue
  2. 3
      dist/6264-6264.js
  3. 0
      dist/6264-6264.js.LICENSE.txt
  4. 1
      dist/6264-6264.js.map
  5. 3
      dist/9923-9923.js
  6. 1
      dist/9923-9923.js.map
  7. 4
      dist/dav-settings-personal-availability.js
  8. 2
      dist/dav-settings-personal-availability.js.map
  9. 4
      dist/files_sharing-files_sharing_tab.js
  10. 2
      dist/files_sharing-files_sharing_tab.js.map

14
apps/files_sharing/src/views/SharingDetailsTab.vue

@ -430,14 +430,14 @@ export default {
return this.fileInfo.type === 'dir'
},
maxExpirationDateEnforced() {
if (this.isPublicShare) {
return this.config.defaultExpirationDate
}
if (this.isRemoteShare) {
return this.config.defaultRemoteExpirationDateString
}
// If it get's here then it must be an internal share
if (this.isExpiryDateEnforced) {
if (this.isPublicShare) {
return this.config.defaultExpirationDate
}
if (this.isRemoteShare) {
return this.config.defaultRemoteExpirationDateString
}
// If it get's here then it must be an internal share
return this.config.defaultInternalExpirationDate
}
return null

3
dist/6264-6264.js
File diff suppressed because it is too large
View File

0
dist/9923-9923.js.LICENSE.txt → dist/6264-6264.js.LICENSE.txt

1
dist/6264-6264.js.map
File diff suppressed because it is too large
View File

3
dist/9923-9923.js
File diff suppressed because it is too large
View File

1
dist/9923-9923.js.map
File diff suppressed because it is too large
View File

4
dist/dav-settings-personal-availability.js
File diff suppressed because it is too large
View File

2
dist/dav-settings-personal-availability.js.map
File diff suppressed because it is too large
View File

4
dist/files_sharing-files_sharing_tab.js
File diff suppressed because it is too large
View File

2
dist/files_sharing-files_sharing_tab.js.map
File diff suppressed because it is too large
View File

Loading…
Cancel
Save