Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consider share type for enforced share expiry dates #40500

Merged
merged 1 commit into from Sep 21, 2023

Conversation

Fenn-CS
Copy link
Contributor

@Fenn-CS Fenn-CS commented Sep 19, 2023

We have three kind of share expiry date enforcements.

  • isDefaultExpireDateEnforced
  • isDefaultInternalExpireDateEnforced
  • isDefaultRemoteExpireDateEnforced

Before these commit, isExpiryDateEnforced that is used to disable/enable the set expiry date checkbox does not take those into consideration which is problematic as those have different applications.

In addition, this commit now uses isExpiryDateEnforced to disable/enable the input for expiry date that shows up before the creation of link shares.

@Fenn-CS Fenn-CS added 3. to review Waiting for reviews feature: sharing labels Sep 19, 2023
@Fenn-CS Fenn-CS force-pushed the improve-expire-date-enforcement branch 2 times, most recently from 468dd6e to 5980ffc Compare September 19, 2023 11:32
@blizzz blizzz requested a review from artonge September 20, 2023 09:48
@blizzz blizzz added this to the Nextcloud 28 milestone Sep 20, 2023
@AndyScherzinger
Copy link
Member

/backport to stable27

@Fenn-CS
Copy link
Contributor Author

Fenn-CS commented Sep 20, 2023

/compile amend /

We have three kind of share expiry date enforcements.

- `isDefaultExpireDateEnforced`
- `isDefaultInternalExpireDateEnforced`
- `isDefaultRemoteExpireDateEnforced`

Before these commit, `isExpiryDateEnforced` that is used to
disable/enable the set expiry date checkbox does not take those into consideration
which is problematic as those have different applications.

In addition, this commit now uses `isExpiryDateEnforced` to disable/enable the input for
expiry date that shows up before the creation of link shares.

Here, `hasExpirationDate` is also removed from 'SharingEntryLink` component as it is
not used.

Signed-off-by: fenn-cs <fenn25.fn@gmail.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@blizzz blizzz merged commit d644525 into master Sep 21, 2023
36 of 39 checks passed
@blizzz blizzz deleted the improve-expire-date-enforcement branch September 21, 2023 07:44
@backportbot-nextcloud
Copy link

The backport to stable27 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable27
git pull origin stable27

# Create the new backport branch
git checkout -b fix/foo-stable27

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable27

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

4 participants