[allura] 01/01: [#4069] Disallow removal of anon read access from projects when nbhd prevents private projects

[ke...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kentontaylor pushed a commit to branch kt/4069
in repository https://gitbox.apache.org/repos/asf/allura.git

commit f8e8e17999e6f5335b48f75528acf49eacc35080
Author: Kenton Taylor <kt...@slashdotmedia.com>
AuthorDate: Mon Sep 14 15:27:00 2020 +0000

    [#4069] Disallow removal of anon read access from projects when nbhd prevents private projects
---
 Allura/allura/ext/admin/templates/project_groups.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Allura/allura/ext/admin/templates/project_groups.html b/Allura/allura/ext/admin/templates/project_groups.html
index f468245..ca6b6f5 100644
--- a/Allura/allura/ext/admin/templates/project_groups.html
+++ b/Allura/allura/ext/admin/templates/project_groups.html
@@ -26,14 +26,18 @@
 
 {% block header %}User Permissions{% endblock %}
 
+{% set private_projects = c.project.neighborhood.features.get('private_projects') %}
+
 {% macro show_perms_for_role(role) %}
   <ul class="permissions">
     {% for perm in permissions_by_role[role._id.__str__()] %}
+    {% if private_projects or (not private_projects and perm['name'] != 'read') %}
     <li class="{{perm['has']}}" data-permission="{{perm['name']}}">
       {{ g.icons['perm_has_%s'%perm['has']].render(title=perm['text'], closing_tag=False) }}
         {{perm['name']}}
       </a> {# close tag, opened by render #}
     </li>
+    {% endif %}
     {% endfor %}
   </ul>
 {% endmacro %}