diff options
| author | fenn-cs <fenn25.fn@gmail.com> | 2023-10-20 10:34:57 +0100 |
|---|---|---|
| committer | nextcloud-command <nextcloud-command@users.noreply.github.com> | 2023-10-22 16:47:32 +0000 |
| commit | 8dfcf2e02a9b9034e3e44c1658e47b699d0b5f27 (patch) | |
| tree | f492713a62a114e89ee9c1831b3aff4e1b36cd12 /apps/files_sharing/src/mixins | |
| parent | 46308e96f36486dd9dd55a41c1979d7f6cafacfe (diff) | |
| download | nextcloud-server-8dfcf2e02a9b9034e3e44c1658e47b699d0b5f27.tar.gz nextcloud-server-8dfcf2e02a9b9034e3e44c1658e47b699d0b5f27.zip | |
Do not treat `isDefaultExpireDateEnforced` as fallback
`isDefaultExpireDateEnforced` and its corresponding `defaultExpirationDate`
is currently treated as the enforcement fallback when share type enforcements are not
set.
However, `isDefaultExpireDateEnforced` and `defaultExpirationDate` are actually more like
`isDefaultPublicExpireDateEnforced` and `defaultPublicExpirationDate` and therefore only applies
to public shares.
It might be ideal to rename this variables all the way from the backend config to the way we use
them in the frontend code.
Signed-off-by: fenn-cs <fenn25.fn@gmail.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
Diffstat (limited to 'apps/files_sharing/src/mixins')
| -rw-r--r-- | apps/files_sharing/src/mixins/SharesMixin.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_sharing/src/mixins/SharesMixin.js b/apps/files_sharing/src/mixins/SharesMixin.js index 2dfcc3e9c0e..860d1716fe0 100644 --- a/apps/files_sharing/src/mixins/SharesMixin.js +++ b/apps/files_sharing/src/mixins/SharesMixin.js @@ -140,9 +140,9 @@ export default { return this.config.isDefaultExpireDateEnforced } if (this.isRemoteShare) { - return this.config.isDefaultRemoteExpireDateEnforced || this.config.isDefaultExpireDateEnforced + return this.config.isDefaultRemoteExpireDateEnforced } - return this.config.isDefaultInternalExpireDateEnforced || this.config.isDefaultExpireDateEnforced + return this.config.isDefaultInternalExpireDateEnforced }, hasCustomPermissions() { const bundledPermissions = [ |