Add extra permissions and link permisions with views #2390
Merged
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
tienne-B
reviewed
Jan 24, 2024
tabbycat/users/groups.py
Outdated
| Permission.EDIT_MOTION, | ||
| Permission.EDIT_RELEASEDRAW, | ||
| Permission.EDIT_UNRELEASEDRAW, | ||
| Permission.EDIT_SETBREAKING, |
There was a problem hiding this comment.
Do we want them to? I think this one refers to teams. (Could we rename this to be clearer?)
tabbycat/users/groups.py
Outdated
Comment on lines
76
to
100
| permissions = [ | ||
| Permission.EDIT_ROUNDAVAILABILITIES_ADJ, | ||
| Permission.EDIT_ROUNDAVAILABILITIES_TEAM, | ||
| Permission.EDIT_ROUNDAVAILABILITIES_VENUE, | ||
| Permission.EDIT_ROOMCATEGORIES, | ||
| Permission.EDIT_ROOMCONSTRAINTS, | ||
| Permission.VIEW_ADMIN_DRAW, | ||
| Permission.EDIT_OLD_BALLOTSUBMISSIONS, | ||
| Permission.EDIT_BALLOTSUBMISSIONS, | ||
| Permission.ADD_BALLOTSUBMISSIONS, | ||
| Permission.MARK_BALLOTSUBMISSIONS, | ||
| Permission.MARK_OTHERS_BALLOTSUBMISSIONS, | ||
| Permission.VIEW_BALLOTSUBMISSION_GRAPH, | ||
| Permission.VIEW_FEEDBACK, | ||
| Permission.VIEW_FEEDBACK_OVERVIEW, | ||
| Permission.VIEW_FEEDBACK_UNSUBMITTED, | ||
| Permission.EDIT_FEEDBACK_CONFIRM, | ||
| Permission.EDIT_FEEDBACK_IGNORE, | ||
| Permission.ADD_FEEDBACK, | ||
| Permission.EDIT_BREAK_ELIGIBILITY, | ||
| Permission.EDIT_SPEAKER_CATEGORIES, | ||
| Permission.VIEW_PRIVATE_URLS, | ||
| Permission.GENERATE_PRIVATE_URLS, | ||
| Permission.SEND_PRIVATE_URLS, | ||
| ] |
There was a problem hiding this comment.
I think there are way more permissions in this list than what they can actually do currently.
tabbycat/participants/views.py
Outdated
| @@ -69,6 +70,7 @@ def get_context_data(self, **kwargs): | |||
|
|
|||
|
|
|||
| class AdminParticipantsListView(AdministratorMixin, BaseParticipantsListView): | |||
| view_permission = Permission.VIEW_TEAMS and Permission.VIEW_ADJUDICATORS | |||
There was a problem hiding this comment.
This won't work either. To annotate my earlier comment:
I don't remember supporting a list of permissions, but it could be done easily. I'm assuming this is an
and.
Meant that you can't have a view be dependent on multiple permissions, but giving a list of permissions could be supported by editing the mixin. You'd also need to specify that all (and) of the listed permissions must be present, rather than merely any.
I'd rather you create a new permission to access this page, rather than try to do permission "logic".
tienne-B
reviewed
Jan 27, 2024
| @@ -149,7 +152,7 @@ def post(self, request: 'HttpRequest', *args, **kwargs) -> 'HttpResponseRedirect | |||
|
|
|||
| class EmailRandomisedUrlsView(RoleColumnMixin, TournamentTemplateEmailCreateView): | |||
| page_subtitle = _("Private URLs") | |||
|
|
|||
| edit_permission = Permission.SEND_PRIVATE_URLS | |||
There was a problem hiding this comment.
Should also add a view permission here, maybe a new one as this also has email addresses, so more personal details.
tienne-B
reviewed
Jan 27, 2024
tabbycat/users/groups.py
Outdated
Comment on lines
128
to
130
| Permission.VIEW_ADJUDICATORS, | ||
| Permission.VIEW_ROOMS, | ||
| Permission.VIEW_INSTITUTIONS, |
tabbycat/users/groups.py
Outdated
Comment on lines
83
to
117
| Permission.EDIT_ROUNDAVAILABILITIES_ADJ, | ||
| Permission.EDIT_ROUNDAVAILABILITIES_TEAM, | ||
| Permission.EDIT_ROUNDAVAILABILITIES_VENUE, | ||
| Permission.EDIT_ROOMCATEGORIES, | ||
| Permission.EDIT_ROOMCONSTRAINTS, | ||
| Permission.VIEW_ADMIN_DRAW, | ||
| Permission.EDIT_OLD_BALLOTSUBMISSIONS, | ||
| Permission.EDIT_BALLOTSUBMISSIONS, | ||
| Permission.ADD_BALLOTSUBMISSIONS, | ||
| Permission.MARK_BALLOTSUBMISSIONS, | ||
| Permission.MARK_OTHERS_BALLOTSUBMISSIONS, | ||
| Permission.VIEW_BALLOTSUBMISSION_GRAPH, | ||
| Permission.VIEW_FEEDBACK, | ||
| Permission.VIEW_FEEDBACK_OVERVIEW, | ||
| Permission.VIEW_FEEDBACK_UNSUBMITTED, | ||
| Permission.EDIT_FEEDBACK_CONFIRM, | ||
| Permission.EDIT_FEEDBACK_IGNORE, | ||
| Permission.ADD_FEEDBACK, | ||
| Permission.EDIT_BREAK_ELIGIBILITY, | ||
| Permission.EDIT_SPEAKER_CATEGORIES, | ||
| Permission.VIEW_PRIVATE_URLS, | ||
| Permission.GENERATE_PRIVATE_URLS, | ||
| Permission.SEND_PRIVATE_URLS, | ||
| Permission.EDIT_PARTICIPANT_CHECKIN, | ||
| Permission.EDIT_ROOM_CHECKIN, | ||
| Permission.VIEW_TEAMS, | ||
| Permission.VIEW_ADJUDICATORS, | ||
| Permission.VIEW_ROOMS, | ||
| Permission.VIEW_INSTITUTIONS, | ||
| Permission.VIEW_PARTICIPANTS, | ||
| Permission.VIEW_ADMIN_DRAW, | ||
| Permission.VIEW_DEBATES, | ||
| Permission.RELEASE_DRAW, | ||
| Permission.UNRELEASE_DRAW, | ||
| Permission.EDIT_STARTTIME, |
There was a problem hiding this comment.
What were the changes here to the previous comment?
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.
No description provided.