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
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fenn-CS
requested review from
AndyScherzinger,
juliushaertl,
artonge and
Pytal
September 19, 2023 11:09
Fenn-CS
force-pushed
the
improve-expire-date-enforcement
branch
2 times, most recently
from
September 19, 2023 11:32
468dd6e
to
5980ffc
Compare
AndyScherzinger
approved these changes
Sep 19, 2023
artonge
reviewed
Sep 20, 2023
/backport to stable27 |
Fenn-CS
force-pushed
the
improve-expire-date-enforcement
branch
from
September 20, 2023 10:04
8104fb6
to
e8d5a3d
Compare
Fenn-CS
force-pushed
the
improve-expire-date-enforcement
branch
from
September 20, 2023 12:49
e8d5a3d
to
d2bb39c
Compare
artonge
approved these changes
Sep 20, 2023
Fenn-CS
force-pushed
the
improve-expire-date-enforcement
branch
from
September 20, 2023 15:01
d2bb39c
to
5f2c602
Compare
nextcloud-command
force-pushed
the
improve-expire-date-enforcement
branch
from
September 20, 2023 15:48
5f2c602
to
268441d
Compare
Fenn-CS
force-pushed
the
improve-expire-date-enforcement
branch
from
September 20, 2023 15:56
8b2b74d
to
25982a7
Compare
/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>
nextcloud-command
force-pushed
the
improve-expire-date-enforcement
branch
from
September 20, 2023 16:43
25982a7
to
56771b5
Compare
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.