Skip to content

Fix the config key on the sharing expire checkbox - #24341

Merged
blizzz merged 1 commit into
masterfrom
fix/sharing-enforce-expire-checkbox
Nov 24, 2020
Merged

Fix the config key on the sharing expire checkbox#24341
blizzz merged 1 commit into
masterfrom
fix/sharing-enforce-expire-checkbox

Conversation

@ChristophWurst

@ChristophWurstChristophWurst commented Nov 24, 2020

Copy link
Copy Markdown
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>
@ChristophWurstChristophWurst added the 3. to review Waiting for reviews label Nov 24, 2020
@ChristophWurstChristophWurst added this to the Nextcloud 21 milestone Nov 24, 2020
@ChristophWurstChristophWurst self-assigned this Nov 24, 2020
@ChristophWurst

ChristophWurst commented Nov 24, 2020

Copy link
Copy Markdown
MemberAuthor

/backport to stable20

@ChristophWurst

ChristophWurst commented Nov 24, 2020

Copy link
Copy Markdown
MemberAuthor

/backport to stable19

@ChristophWurst

ChristophWurst commented Nov 24, 2020

Copy link
Copy Markdown
MemberAuthor

/backport to stable18

rullzer
rullzer approved these changes Nov 24, 2020
View reviewed changes

@rullzerrullzer left a comment

Copy link
Copy Markdown
Member

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

wiswedel commented Nov 24, 2020

Copy link
Copy Markdown
Contributor

Is this maybe related to #19786?

skjnldsv
skjnldsv approved these changes Nov 24, 2020
View reviewed changes

@skjnldsvskjnldsv left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

🙈

@ChristophWurst

ChristophWurst commented Nov 24, 2020

Copy link
Copy Markdown
MemberAuthor

Is this maybe related to #19786?

Possibly. Do you have a dev instance to check?

@ChristophWurstChristophWurst 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

wiswedel commented Nov 24, 2020

Copy link
Copy Markdown
Contributor

Possibly. Do you have a dev instance to check?

no, sorry

@ChristophWurst

ChristophWurst commented Nov 24, 2020

Copy link
Copy Markdown
MemberAuthor

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

wiswedel commented Nov 24, 2020

Copy link
Copy Markdown
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 masterNov 24, 2020
@blizzz
blizzz deleted the fix/sharing-enforce-expire-checkbox branch November 24, 2020 14:49
This was referenced Nov 24, 2020
Merged
Merged
@backportbot-nextcloud

backportbot-nextcloudBot commented Nov 24, 2020

Copy link
Copy Markdown

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

@MorrisJobkeMorrisJobke mentioned this pull request Dec 1, 2020
Merged
@MorrisJobke

MorrisJobke commented Dec 1, 2020

Copy link
Copy Markdown
Member

stable18 backport is in #24481

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

Reviewers

@rullzerrullzerrullzer approved these changes
@blizzzblizzzblizzz approved these changes
@skjnldsvskjnldsvskjnldsv approved these changes
@juliusknorrjuliusknorrAwaiting requested review from juliusknorr
@julien-ncjulien-ncAwaiting requested review from julien-nc

Assignees

@ChristophWurstChristophWurst

Labels

4. to releaseReady to be released and/or waiting for tests to finishbugfeature: 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