Skip to content

Commit 5d15bfe

Browse files
author
Yeray Diaz Diaz
authored
Allow moderators to perform project ownership transfers (#9378)
Specifically adding and removing users with any role
1 parent 7417840 commit 5d15bfe

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

warehouse/admin/templates/admin/projects/detail.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ <h4>Maintainers:</h4>
124124
<td><a href="{{ request.route_path('admin.user.detail', user_id=role.user.id) }}">{{ role.user.username }}</a></td>
125125
<td>{{ role.role_name }}</td>
126126
<td>
127-
<button type="button" class="btn-danger btn-sm" data-toggle="modal" data-target="#deleteRoleModal-{{ role.id }}" {{ "disabled" if not request.has_permission('admin') }}>
127+
<button type="button" class="btn-danger btn-sm" data-toggle="modal" data-target="#deleteRoleModal-{{ role.id }}" {{ "disabled" if not request.has_permission('moderator') }}>
128128
<i class="fa fa-trash"></i>
129129
</button>
130130
<div class="modal fade" id="deleteRoleModal-{{ role.id }}" tabindex="-1" role="dialog">
@@ -163,10 +163,10 @@ <h4 class="modal-title" id="exampleModalLabel">Remove role for {{ role.user.user
163163
<form method="POST" action="{{ request.route_path('admin.project.add_role', project_name=project.name) }}">
164164
<input name="csrf_token" type="hidden" value="{{ request.session.get_csrf_token() }}">
165165
<td>
166-
<input name="username" class="form-control" placeholder="Username" required {{ "disabled" if not request.has_permission('admin') }}>
166+
<input name="username" class="form-control" placeholder="Username" required {{ "disabled" if not request.has_permission('moderator') }}>
167167
</td>
168168
<td>
169-
<select class="form-control" name="role_name" required {{ "disabled" if not request.has_permission('admin') }}>
169+
<select class="form-control" name="role_name" required {{ "disabled" if not request.has_permission('moderator') }}>
170170
<option disabled selected>Select a role</option>
171171
{% for role_name in ['Maintainer', 'Owner'] %}
172172
<option value="{{ role_name }}">
@@ -176,7 +176,7 @@ <h4 class="modal-title" id="exampleModalLabel">Remove role for {{ role.user.user
176176
</select>
177177
</td>
178178
<td>
179-
<button type="submit" class="btn btn-primary btn-sm" {{ "disabled" if not request.has_permission('admin') }}>
179+
<button type="submit" class="btn btn-primary btn-sm" {{ "disabled" if not request.has_permission('moderator') }}>
180180
<i class="fa fa-plus"></i>
181181
</button>
182182
</td>

warehouse/admin/views/projects.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ def set_total_size_limit(project, request):
337337

338338
@view_config(
339339
route_name="admin.project.add_role",
340-
permission="admin",
340+
permission="moderator",
341341
request_method="POST",
342342
uses_session=True,
343343
require_methods=False,
@@ -408,7 +408,7 @@ def add_role(project, request):
408408

409409
@view_config(
410410
route_name="admin.project.delete_role",
411-
permission="admin",
411+
permission="moderator",
412412
request_method="POST",
413413
uses_session=True,
414414
require_methods=False,

0 commit comments

Comments
 (0)