Skip to content

Commit 9fa3893

Browse files
authored
Merge pull request #49809 from nextcloud/backport/49799/stable30
[stable30] fix(files_sharing): Correct property enforced property names
2 parents c87755d + 508a10a commit 9fa3893

File tree

9 files changed

+14
-15
lines changed

9 files changed

+14
-15
lines changed

apps/files_sharing/src/components/SharingEntryLink.vue

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -484,23 +484,22 @@ export default {
484484
pendingDefaultExpirationDate() {
485485
return (this.config.defaultExpirationDate instanceof Date || !isNaN(new Date(this.config.defaultExpirationDate).getTime())) && this.isPendingShare
486486
},
487-
488487
isPendingShare() {
489488
return !!(this.share && !this.share.id)
490489
},
491-
sharePolicyHasRequiredProperties() {
490+
sharePolicyHasEnforcedProperties() {
492491
return this.config.enforcePasswordForPublicLink || this.config.isDefaultExpireDateEnforced
493492
},
494493
495-
requiredPropertiesMissing() {
494+
enforcedPropertiesMissing() {
496495
// Ensure share exist and the share policy has required properties
497-
if (!this.sharePolicyHasRequiredProperties) {
496+
if (!this.sharePolicyHasEnforcedProperties) {
498497
return false
499498
}
500499
501500
if (!this.share) {
502501
// if no share, we can't tell if properties are missing or not so we assume properties are missing
503-
return true
502+
return true
504503
}
505504
506505
// If share has ID, then this is an incoming link share created from the existing link share
@@ -602,7 +601,7 @@ export default {
602601
* @param {boolean} shareReviewComplete if the share was reviewed
603602
* @return {boolean}
604603
*/
605-
shareRequiresReview(shareReviewComplete) {
604+
shareRequiresReview(shareReviewComplete) {
606605
// If a user clicks 'Create share' it means they have reviewed the share
607606
if (shareReviewComplete) {
608607
return false
@@ -613,7 +612,7 @@ export default {
613612
* Create a new share link and append it to the list
614613
* @param {boolean} shareReviewComplete if the share was reviewed
615614
*/
616-
async onNewLinkShare(shareReviewComplete = false) {
615+
async onNewLinkShare(shareReviewComplete = false) {
617616
this.logger.debug('onNewLinkShare called (with this.share)', this.share)
618617
// do not run again if already loading
619618
if (this.loading) {
@@ -629,7 +628,7 @@ export default {
629628
shareDefaults.expiration = this.formatDateToString(this.config.defaultExpirationDate)
630629
}
631630
632-
this.logger.debug('Missing required properties?', this.requiredPropertiesMissing)
631+
this.logger.debug('Missing required properties?', this.enforcedPropertiesMissing)
633632
// Do not push yet if we need a password or an expiration date: show pending menu
634633
// A share would require a review for example is default expiration date is set but not enforced, this allows
635634
// the user to review the share and remove the expiration date if they don't want it
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/2249-2249.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/2249-2249.js.map.license

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2249-2249.js.license

dist/8142-8142.js.map

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

dist/8142-8142.js.map.license

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

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)