Skip to content

Commit

Permalink
Merge pull request #49807 from nextcloud/backport/49799/stable28
Browse files Browse the repository at this point in the history
[stable28] fix(files_sharing): Correct property enforced property names
  • Loading branch information
blizzz authored Dec 12, 2024
2 parents 141ba03 + 1e3e570 commit caa0008
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 15 deletions.
15 changes: 7 additions & 8 deletions apps/files_sharing/src/components/SharingEntryLink.vue
Original file line number Diff line number Diff line change
Expand Up @@ -434,23 +434,22 @@ export default {
pendingDefaultExpirationDate() {
return (this.config.defaultExpirationDate instanceof Date || !isNaN(new Date(this.config.defaultExpirationDate).getTime())) && this.isPendingShare
},

isPendingShare() {
return !!(this.share && !this.share.id)
},
sharePolicyHasRequiredProperties() {
sharePolicyHasEnforcedProperties() {
return this.config.enforcePasswordForPublicLink || this.config.isDefaultExpireDateEnforced
},

requiredPropertiesMissing() {
enforcedPropertiesMissing() {
// Ensure share exist and the share policy has required properties
if (!this.sharePolicyHasRequiredProperties) {
if (!this.sharePolicyHasEnforcedProperties) {
return false
}

if (!this.share) {
// if no share, we can't tell if properties are missing or not so we assume properties are missing
return true
return true
}

// If share has ID, then this is an incoming link share created from the existing link share
Expand Down Expand Up @@ -554,7 +553,7 @@ export default {
* @param {boolean} shareReviewComplete if the share was reviewed
* @return {boolean}
*/
shareRequiresReview(shareReviewComplete) {
shareRequiresReview(shareReviewComplete) {
// If a user clicks 'Create share' it means they have reviewed the share
if (shareReviewComplete) {
return false
Expand All @@ -565,7 +564,7 @@ export default {
* Create a new share link and append it to the list
* @param {boolean} shareReviewComplete if the share was reviewed
*/
async onNewLinkShare(shareReviewComplete = false) {
async onNewLinkShare(shareReviewComplete = false) {
this.logger.debug('onNewLinkShare called (with this.share)', this.share)
// do not run again if already loading
if (this.loading) {
Expand All @@ -581,7 +580,7 @@ export default {
shareDefaults.expiration = this.formatDateToString(this.config.defaultExpirationDate)
}

this.logger.debug('Missing required properties?', this.requiredPropertiesMissing)
this.logger.debug('Missing required properties?', this.enforcedPropertiesMissing)
// Do not push yet if we need a password or an expiration date: show pending menu
// A share would require a review for example is default expiration date is set but not enforced, this allows
// the user to review the share and remove the expiration date if they don't want it
Expand Down
1 change: 0 additions & 1 deletion dist/376-376.js.map

This file was deleted.

6 changes: 3 additions & 3 deletions dist/376-376.js → dist/984-984.js

Large diffs are not rendered by default.

File renamed without changes.
1 change: 1 addition & 0 deletions dist/984-984.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/files_sharing-files_sharing_tab.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/files_sharing-files_sharing_tab.js.map

Large diffs are not rendered by default.

0 comments on commit caa0008

Please sign in to comment.