Skip to content

Commit 8dfcf2e

Browse files
nfebenextcloud-command
authored andcommitted
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>
1 parent 46308e9 commit 8dfcf2e

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

apps/files_sharing/src/mixins/SharesMixin.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ export default {
140140
return this.config.isDefaultExpireDateEnforced
141141
}
142142
if (this.isRemoteShare) {
143-
return this.config.isDefaultRemoteExpireDateEnforced || this.config.isDefaultExpireDateEnforced
143+
return this.config.isDefaultRemoteExpireDateEnforced
144144
}
145-
return this.config.isDefaultInternalExpireDateEnforced || this.config.isDefaultExpireDateEnforced
145+
return this.config.isDefaultInternalExpireDateEnforced
146146
},
147147
hasCustomPermissions() {
148148
const bundledPermissions = [

dist/4511-4511.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/4511-4511.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.

dist/dav-settings-personal-availability.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/dav-settings-personal-availability.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.

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)