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.

Sign up for GitHub

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

Jump to bottom

Fix the config key on the sharing expire checkbox #24341

Merged
merged 1 commit into from
Nov 24, 2020
Merged

Fix the config key on the sharing expire checkbox #24341

merged 1 commit into from
Nov 24, 2020

Conversation

ChristophWurst
Copy link
Member

We don't use shareapi_internal_enforce_expire_date anywhere.
shareapi_enforce_internal_expire_date is the one we want.

Regression of #17725.

On master you can't actually set/unset "Enforce expiration date". The js will update some config value, but it's the wrong one. Hence the expiration date was always enforced.

@ChristophWurst
Fix the config key on the sharing expire checkbox
2526c5e 
We don't use `shareapi_internal_enforce_expire_date` anywhere.
`shareapi_enforce_internal_expire_date` is the one we want.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
@ChristophWurst ChristophWurst added the 3. to review Waiting for reviews label Nov 24, 2020
@ChristophWurst ChristophWurst added this to the Nextcloud 21 milestone Nov 24, 2020
@ChristophWurst ChristophWurst self-assigned this Nov 24, 2020
@ChristophWurst
Copy link
Member Author

/backport to stable20

@ChristophWurst
Copy link
Member Author

/backport to stable19

@ChristophWurst
Copy link
Member Author

/backport to stable18

rullzer
rullzer approved these changes Nov 24, 2020
View reviewed changes
Copy link
Member

@rullzer rullzer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Took you long enough to find my error!

@wiswedel
Copy link
Contributor

Is this maybe related to #19786?

skjnldsv
skjnldsv approved these changes Nov 24, 2020
View reviewed changes
Copy link
Member

@skjnldsv skjnldsv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🙈

@ChristophWurst
Copy link
Member Author

Is this maybe related to #19786?

Possibly. Do you have a dev instance to check?

@ChristophWurst ChristophWurst added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Nov 24, 2020
@wiswedel
Copy link
Contributor

Possibly. Do you have a dev instance to check?

no, sorry

@ChristophWurst
Copy link
Member Author

I looks like the code takes the default sharing date still. Like I disabled the option and I a default expiration date of 7d. So I don't think this changes anything for that ticket. This PR is really just about that one specific checkbox.

@wiswedel
Copy link
Contributor

I looks like the code takes the default sharing date still. Like I disabled the option and I a default expiration date of 7d. So I don't think this changes anything for that ticket. This PR is really just about that one specific checkbox.

OK, thanks for looking into it anyway. There was a chance 😉

@blizzz blizzz merged commit 6156a49 into master Nov 24, 2020
@blizzz blizzz deleted the fix/sharing-enforce-expire-checkbox branch November 24, 2020 14:49
@backportbot-nextcloud backportbot-nextcloud bot mentioned this pull request Nov 24, 2020
Merged
@backportbot-nextcloud backportbot-nextcloud bot mentioned this pull request Nov 24, 2020
Merged
@backportbot-nextcloud
Copy link

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

@MorrisJobke MorrisJobke mentioned this pull request Dec 1, 2020
Merged
@MorrisJobke
Copy link
Member

stable18 backport is in #24481

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@skjnldsv skjnldsv skjnldsv approved these changes

@blizzz blizzz blizzz approved these changes

@rullzer rullzer rullzer approved these changes

@juliusknorr juliusknorr Awaiting requested review from juliusknorr

@julien-nc julien-nc Awaiting requested review from julien-nc

Assignees

@ChristophWurst ChristophWurst

Labels
4. to release Ready to be released and/or waiting for tests to finish bug feature: sharing
Projects
None yet
Milestone
Nextcloud 21
Development

Successfully merging this pull request may close these issues.
6 participants
@ChristophWurst @wiswedel @MorrisJobke @rullzer @blizzz @skjnldsv