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.

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

AO3-6141 Disable user role checkboxes based on admin permissions #4355

Merged

Conversation

Cesium-Ice
Copy link
Contributor

@Cesium-Ice Cesium-Ice commented Sep 28, 2022

Pull Request Checklist

Issue

https://otwarchive.atlassian.net/browse/AO3-6141

Purpose

What does this PR do?

Testing Instructions

How can the Archive's QA team verify that this is working as you intended?

If you have a Jira account with access, please update or comment on the issue
with any new or missing testing instructions instead.

References

Are there other relevant issues/pull requests/mailing list discussions?

Credit

What name and pronouns should we use to credit you in the Archive of Our Own's Release Notes?

If you have a Jira account, please include the same name in the "Full name"
field on your Jira profile, so we can assign you the issues you're working on.

Cesium-Ice, she/her

@redsummernight redsummernight changed the title AO3-6141 disable user role checkboxes AO3-6141 Disable user role checkboxes based on admin permissions Dec 12, 2022
app/views/admin/admin_users/_user_form.html.erb Outdated Show resolved Hide resolved
app/policies/user_policy.rb Outdated Show resolved Hide resolved
Copy link
Member

@redsummernight redsummernight left a comment

Choose a reason for hiding this comment

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

Looks good, thanks!

@sarken sarken merged commit 630812b into otwcode:master Jun 19, 2023
sarken added a commit that referenced this pull request Jun 19, 2023
sarken added a commit that referenced this pull request Jun 19, 2023
…ons" (#4531)

Revert "AO3-6141 Disable user role checkboxes based on admin permissions (#4355)"

This reverts commit 630812b.
sarken pushed a commit to sarken/otwarchive that referenced this pull request Jun 24, 2023
…code#4355)

* AO3 6141 disable user role checkboxes

* please hound

* move logic to userpolicy class

* please hound

* use hash for checking that admin role can edit user role

* please hound
@Cesium-Ice Cesium-Ice deleted the AO3-6141-disable-user-role-checkboxes branch September 10, 2024 05:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants