0004-manager-remove-children-table-from-role-members-page.patch

Valentin Deniaud, 03 novembre 2021 14:15

Voir les différences: en ligne côte à côte

Subject: [PATCH 4/4] manager: remove children table from role members page
 (#57955)

 src/authentic2/manager/role_views.py          |  8 -----
 .../authentic2/manager/role_members.html      | 31 ++-----------------
 tests/test_ldap.py                            |  2 +-
 tests/test_role_manager.py                    | 30 ++++++++----------
 4 files changed, 17 insertions(+), 54 deletions(-)

         def get_context_data(self, **kwargs):
             ctx = super().get_context_data(**kwargs)
             ctx['children'] = list(
                 views.filter_view(
                     self.request,
                     self.object.children(include_self=False, annotate=True).order_by(
                         F('ou').asc(nulls_first=True), 'name'
                     ),
                 )[:11]
+            )
             ctx['parents'] = list(
                 views.filter_view(
                     self.request,

           <li><a href="{% url "a2-manager-role-permissions" pk=object.pk %}">{% trans "Permissions" %}</a></li>
           {% endif %}
           <li><a href="{% url "a2-manager-role-journal" pk=object.pk %}">{% trans "Journal" %}</a></li>
           {% if view.can_manage_members %}
           <li><a href="{% url "a2-manager-role-children" pk=object.pk %}">{% trans "Add a role as a member" %}</a></li>
           {% endif %}
         </ul>
       </span>
     {% endblock %}
-...
          {% endif %}
        </div>
      </div>
      <div class="section">
        <h3>{% trans "Grants its permissions to roles:" %}
          {% if view.can_manage_members %}
          <a href="{% url "a2-manager-role-children" pk=object.pk %}" class="button">{% trans "Edit" %}</a>
          {% else %}
          <a title="{% trans "Permission denied" %}" class="button disabled">{% trans "Edit" %}</a>
          {% endif %}
        </h3>
        <div>
          {% if children %}
          <ul class="objects-list single-links">
            {% for child in children|slice:":10" %}
            <li>
              <a  class="role-inheritance-child" href="{% url "a2-manager-role-members" pk=child.pk %}">{% if child.ou and has_multiple_ou %}{{ child.ou }} - {% endif %}{{ child }}</a>
              {% if not child.direct %}
              <span class="badge">{% trans "Indirect" %}</span>
              {% endif %}
            </li>
            {% endfor %}
            {% if children|length > 10 %}
            <li><a class="role-inheritance-view-all" href="{% url "a2-manager-role-children" pk=object.pk %}">({% trans "view all roles" %})</a></li>
            {% endif %}
          </ul>
          {% else %}
          <p>{% trans "This role doesn't grant its permissions to any other role." %}</p>
          {% endif %}
        </div>
      </div>
      <fieldset class="gadjo-foldable gadjo-folded" id="other-properties">
      <legend class="gadjo-foldable-widget">{% trans "Advanced parameters" %}</legend>

         response = app.get('/manage/roles/%s/' % (role.pk))
         assert 'synchronised from LDAP' in response.text
         assert 'Add a role as a member' not in response.text
         q = response.pyquery.remove_namespaces()
         assert not q('form.manager-m2m-add-form')
         assert q('div.section h3 a.button.disabled')
         assert not q('table tbody td a.icon-remove-sign js-remove-object')

         assert 'name,slug,ou' in resp.text
     @pytest.mark.parametrize('relation', ['child', 'parent'])
     def test_role_members_display_inheritance_info(app, superuser, settings, simple_role, relation):
     def test_role_members_display_role_parents(app, superuser, settings, simple_role):
         url = reverse('a2-manager-role-members', kwargs={'pk': simple_role.pk})
         resp = login(app, superuser, url)
         assert "This role doesn't grant its permissions to any other role." in resp.text
         assert "This role doesn't contain permissions of any other role." in resp.text
         for i in range(10):
             role = Role.objects.create(name=f'Role {i}', ou=get_default_ou())
             getattr(simple_role, 'add_%s' % relation)(role)
             simple_role.add_parent(role)
         resp = app.get(url)
         if relation == 'child':
             assert "This role doesn't grant its permissions to any other role." not in resp.text
             assert "This role doesn't contain permissions of any other role." in resp.text
         elif relation == 'parent':
             assert "This role doesn't grant its permissions to any other role." in resp.text
             assert "This role doesn't contain permissions of any other role." not in resp.text
         for i, el in enumerate(resp.pyquery.find('a.role-inheritance-%s' % relation)):
         assert "This role doesn't contain permissions of any other role." not in resp.text
         for i, el in enumerate(resp.pyquery.find('a.role-inheritance-parent')):
             assert el.text == f'Role {i}'
         assert '(view all roles)' not in resp.text
         role = Role.objects.create(name='Role a', ou=get_default_ou())
         getattr(simple_role, 'add_%s' % relation)(role)
         simple_role.add_parent(role)
         resp = app.get(url)
         assert not resp.pyquery('a.role-inheritance-%s:contains("Role a")' % relation)
         assert 'Role a' not in resp.text
         assert '(view all roles)' in resp.text
         resp = resp.click('(view all roles)', href=relation)
         resp = resp.click('(view all roles)')
         assert 'Role a' in resp.text
         # display OU if there are more than one
         ou1 = OU.objects.create(name='ou1')
         resp = app.get(url)
         for i, el in enumerate(resp.pyquery.find('a.role-inheritance-%s' % relation)):
         for i, el in enumerate(resp.pyquery.find('a.role-inheritance-parent')):
             assert el.text == f'Default organizational unit - Role {i}'
         # sort by OU, then name
-...
         Role.objects.filter(name__in=['Role 5', 'Role 6']).update(ou=None)
         resp = app.get(url)
         assert [el.text for el in resp.pyquery.find('a.role-inheritance-%s' % relation)] == [
         assert [el.text for el in resp.pyquery.find('a.role-inheritance-parent')] == [
             'Role 5',
             'Role 6',
             'Default organizational unit - Role 0',
-...
         rows = [text_content(el) for el in resp.pyquery('tr td.link')]
         assert rows == ['user1', 'Jôhn Dôe']
         resp = resp.click('Add a role as a member')
         assert 'Role a' in resp.text
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0004-manager-remove-children-table-from-role-members-page.patch