mirror of
https://github.com/nextcloud/server.git
synced 2026-05-28 04:32:30 -04:00
Merge pull request #49799 from nextcloud/fix/no-issue/enforced-props-checks
fix(files_sharing): Correct property enforced property names
This commit is contained in:
commit
000ee5410f
9 changed files with 14 additions and 15 deletions
|
|
@ -486,23 +486,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
|
||||
|
|
@ -604,7 +603,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
|
||||
|
|
@ -615,7 +614,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) {
|
||||
|
|
@ -631,7 +630,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
|
||||
|
|
|
|||
4
dist/4005-4005.js → dist/3537-3537.js
vendored
4
dist/4005-4005.js → dist/3537-3537.js
vendored
File diff suppressed because one or more lines are too long
1
dist/3537-3537.js.map
vendored
Normal file
1
dist/3537-3537.js.map
vendored
Normal file
File diff suppressed because one or more lines are too long
1
dist/3537-3537.js.map.license
vendored
Symbolic link
1
dist/3537-3537.js.map.license
vendored
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
3537-3537.js.license
|
||||
1
dist/4005-4005.js.map
vendored
1
dist/4005-4005.js.map
vendored
File diff suppressed because one or more lines are too long
1
dist/4005-4005.js.map.license
vendored
1
dist/4005-4005.js.map.license
vendored
|
|
@ -1 +0,0 @@
|
|||
4005-4005.js.license
|
||||
4
dist/files_sharing-files_sharing_tab.js
vendored
4
dist/files_sharing-files_sharing_tab.js
vendored
File diff suppressed because one or more lines are too long
2
dist/files_sharing-files_sharing_tab.js.map
vendored
2
dist/files_sharing-files_sharing_tab.js.map
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue