Commit be75b8be authored by Michal Čihař's avatar Michal Čihař

Make owner removal work as expected

Signed-off-by: default avatarMichal Čihař <michal@cihar.com>
parent 65eb6ffb
......@@ -171,6 +171,7 @@
<td>{{ user.first_name }}</td>
<td>{{ user.email }}</td>
<td>
{% if owner_count > 1 %}
<form action="{% url "delete-user" project=object.slug %}" method="post">
{% csrf_token %}
<input type="hidden" name="name" value="{{ user.username }}" />
......@@ -179,7 +180,6 @@
{% trans "Remove" %}
</button>
</form>
{% if owner_count > 1 %}
<form action="{% url "revoke-owner" project=object.slug %}" method="post">
{% csrf_token %}
<input type="hidden" name="name" value="{{ user.username }}" />
......
......@@ -109,10 +109,18 @@ def delete_user(request, project):
obj, form = check_user_form(request, project)
if form is not None:
obj.remove_user(form.cleaned_data['user'])
messages.success(
request, _('User has been removed from this project.')
)
is_owner = obj.owners.filter(
id=form.cleaned_data['user'].id
).exists()
if is_owner and obj.owners.count() <= 1:
messages.error(request, _('You can not remove last owner!'))
else:
if is_owner:
obj.owners.remove(form.cleaned_data['user'])
obj.remove_user(form.cleaned_data['user'])
messages.success(
request, _('User has been removed from this project.')
)
return redirect_param(
'project',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment