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
Fix password change during parental control schedule #8013
Merged
Bond-009
merged 4 commits into
jellyfin:release-10.8.z
from
daullmer:parental_password_fix
Jul 7, 2022
Merged
Fix password change during parental control schedule #8013
Bond-009
merged 4 commits into
jellyfin:release-10.8.z
from
daullmer:parental_password_fix
Jul 7, 2022
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
Since it's a bugfix you should target the 10.8 release branch so it'll be in the current stable release too |
daullmer
force-pushed
the
parental_password_fix
branch
from
June 26, 2022 12:07
4f8f213
to
7efa4e3
Compare
cvium
reviewed
Jun 27, 2022
cvium
reviewed
Jul 4, 2022
false).ConfigureAwait(false); | ||
|
||
if (success == null) | ||
if (await RequestHelpers.IsUserAdministrator(_authContext, HttpContext.Request).ConfigureAwait(false)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You should be able to simply do HttpContext.User.IsInRole(UserRoles.Administrator)
, but I believe you are missing a negation
daullmer
force-pushed
the
parental_password_fix
branch
from
July 4, 2022 17:11
6cb6e8d
to
257cd89
Compare
daullmer
force-pushed
the
parental_password_fix
branch
from
July 4, 2022 17:19
257cd89
to
81e535f
Compare
crobibero
approved these changes
Jul 6, 2022
cvium
approved these changes
Jul 6, 2022
Bond-009
approved these changes
Jul 7, 2022
jellyfin-bot
pushed a commit
that referenced
this pull request
Jul 20, 2022
Fix password change during parental control schedule Authored-by: David Ullmer <davidullmer@outlook.de> Merged-by: Bond-009 <bond.009@outlook.com> Original-merge: 84a1674
Kakadus
pushed a commit
to Kakadus/jellyfin
that referenced
this pull request
Oct 2, 2022
Fix password change during parental control schedule Authored-by: David Ullmer <davidullmer@outlook.de> Merged-by: Bond-009 <bond.009@outlook.com> Original-merge: 84a1674
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.
Changes
Allow admin to change password of user even if user is currently blocked to sign in because of parental control schedule
Issues
Fix #7930