Skip to content

Consider share type for enforced share expiry dates - #40500

Merged
blizzz merged 1 commit into
masterfrom
improve-expire-date-enforcement
Sep 21, 2023
Merged

Consider share type for enforced share expiry dates#40500
blizzz merged 1 commit into
masterfrom
improve-expire-date-enforcement

Conversation

@nfebe

Copy link
Copy Markdown
Contributor

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.

@nfebe
nfebeforce-pushed the improve-expire-date-enforcement branch 2 times, most recently from 468dd6e to 5980ffcCompareSeptember 19, 2023 11:32
Comment threadapps/files_sharing/src/mixins/SharesMixin.js
Comment threadapps/files_sharing/src/views/SharingDetailsTab.vue Outdated
@blizzz
blizzz requested a review from artongeSeptember 20, 2023 09:48
@blizzzblizzz added this to the Nextcloud 28 milestone Sep 20, 2023
@AndyScherzinger

Copy link
Copy Markdown
Member

/backport to stable27

@nfebe
nfebeforce-pushed the improve-expire-date-enforcement branch from d2bb39c to 5f2c602CompareSeptember 20, 2023 15:01
@nextcloud-command
nextcloud-commandforce-pushed the improve-expire-date-enforcement branch from 5f2c602 to 268441dCompareSeptember 20, 2023 15:48
@nfebe
nfebeforce-pushed the improve-expire-date-enforcement branch from 8b2b74d to 25982a7CompareSeptember 20, 2023 15:56
@nfebe

Copy link
Copy Markdown
ContributorAuthor

/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
nextcloud-commandforce-pushed the improve-expire-date-enforcement branch from 25982a7 to 56771b5CompareSeptember 20, 2023 16:43
@blizzz
blizzz merged commit d644525 into masterSep 21, 2023
@blizzz
blizzz deleted the improve-expire-date-enforcement branch September 21, 2023 07:44
@backportbot-nextcloud

Copy link
Copy Markdown

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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviewsfeature: sharing

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

5 participants

@nfebe@AndyScherzinger@artonge@blizzz@skjnldsv