Merge remote-tracking branch 'origin/master'

weblate/html/project.html

@@ -172,6 +172,7 @@
   <td>{{ user.email }}</td>
   <td>
 {% if owner_count > 1 %}
+{% if object.enable_acl %}
 <form action="{% url "delete-user" project=object.slug %}" method="post">
 {% csrf_token %}
 <input type="hidden" name="name" value="{{ user.username }}" />
@@ -180,6 +181,7 @@
 {% trans "Remove" %}
 </button>
 </form>
+{% endif %}
 <form action="{% url "revoke-owner" project=object.slug %}" method="post">
 {% csrf_token %}
 <input type="hidden" name="name" value="{{ user.username }}" />
@@ -193,6 +195,7 @@
   </tr>
   {% endfor %}
 {% endwith %}
+{% if object.enable_acl %}
   {% for user in object.all_users %}
   <tr>
   <td>{{ user.username }}</td>
@@ -218,6 +221,7 @@
   </td>
   </tr>
   {% endfor %}
+{% endif %}
   </tbody>
   </table>
   </div>
@@ -227,10 +231,20 @@
 
 <div class="col-lg-6">
 
+{% if object.enable_acl %}
 <form action="{% url "add-user" project=object.slug %}" method="post">
+{% else %}
+<form action="{% url "make-owner" project=object.slug %}" method="post">
+{% endif %}
 {% csrf_token %}
 <div class="panel panel-primary">
-  <div class="panel-heading"><h4 class="panel-title">{% trans "Add new user" %}</h4></div>
+  <div class="panel-heading"><h4 class="panel-title">
+{% if object.enable_acl %}
+  {% trans "Add new user" %}
+{% else %}
+  {% trans "Add new owner" %}
+{% endif %}
+  </h4></div>
   <div class="panel-body">
     {{ add_user_form|crispy }}
   </div>

weblate/trans/permissions.py

@@ -250,7 +250,4 @@ def can_manage_acl(user, project):
     """
     Checks whether user can manage ACL on given project.
     """
-    if not project.enable_acl:
-        return False
-
     return check_permission(user, project, 'trans.manage_acl')

weblate/trans/views/acl.py

@@ -88,7 +88,7 @@ def revoke_owner(request, project):
 def add_user(request, project):
     obj, form = check_user_form(request, project)
 
-    if form is not None:
+    if form is not None and obj.enable_acl:
         obj.add_user(form.cleaned_data['user'])
         messages.success(
             request, _('User has been added to this project.')
@@ -106,7 +106,7 @@ def add_user(request, project):
 def delete_user(request, project):
     obj, form = check_user_form(request, project)
 
-    if form is not None:
+    if form is not None and obj.enable_acl:
         is_owner = obj.owners.filter(
             id=form.cleaned_data['user'].id
         ).exists()