0001-misc-fix-shown_because_admin-has-no-role-and-cell.re.patch

Benjamin Dauvergne, 12 août 2020 18:54

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

Subject: [PATCH] misc: fix shown_because_admin has no role and
 cell.restricted_to_unlogged is True (#45846)

 combo/data/models.py               |  4 +-
 combo/public/templatetags/combo.py | 11 +---
 tests/test_cells.py                | 87 +++++++++++++++++++++++++++++-
 tox.ini                            |  1 +
 4 files changed, 91 insertions(+), 12 deletions(-)

         pass
     def element_is_visible(element, user=None):
     def element_is_visible(element, user=None, ignore_superuser=False):
         if element.public:
             if getattr(element, 'restricted_to_unlogged', None) is True:
                 return (user is None or user.is_anonymous)
             return True
         if user is None or user.is_anonymous:
             return False
         if user.is_superuser:
         if user.is_superuser and not ignore_superuser:
             return True
         page_groups = element.groups.all()
         if not page_groups:

     from django.utils.safestring import mark_safe
     from django.utils.timezone import is_naive, make_aware
     from combo.data.models import Page, Placeholder
     from combo.data.models import Page, Placeholder, element_is_visible
     from combo.public.menu import get_menu_context
     from combo.utils import NothingInCacheException, flatten_context
     from combo.utils.date import make_date, make_datetime
-...
     @register.filter
     def shown_because_admin(cell, request):
         if not (request.user and request.user.is_superuser):
             return False
         if cell.public:
             return False
         cell_groups = cell.groups.all()
         if not cell_groups:
             return False
         return not(set(cell_groups).intersection(request.user.groups.all()))
         return not element_is_visible(cell, user=request.user, ignore_superuser=True)
     @register.filter(name='has_role')

     from django.test import override_settings
     from django.test.client import RequestFactory
     from django.test.utils import CaptureQueriesContext
     from django.contrib.auth.models import User
     from django.contrib.auth.models import User, Group
     from django.urls import reverse
     from django.utils.encoding import force_text, force_bytes
     from django.utils.timezone import now
-...
         resp = app.get('/manage/assets/')
         assert link_cell.get_slug_for_asset() == 'test_cell_assets'
         assert u'Picture — %s (test)' % link_cell.get_label_for_asset() in resp.text
     @pytest.fixture
     def group(db):
         return Group.objects.create(name='Group')
     @pytest.fixture
     def cell_visibility_setup(db, group):
         pg = Page.objects.create(title='Test', slug='test', template_name='standard')
         order = 0
         def make_cell(**kwargs):
             nonlocal order
             try:
                 return TextCell.objects.create(page=pg, placeholder='content', order=order, **kwargs)
             finally:
                 order += 1
         make_cell(text='<p>Always visible</p>')
         make_cell(text='<p>Visible to unlogged only</p>', restricted_to_unlogged=True)
         make_cell(text='<p>Visible to logged only</p>', public=False)
         make_cell(text='<p>Visible only to member of group</p>', public=False).groups.add(group)
         make_cell(text='<p>Visible only to non-member of group</p>', public=False,
                   restricted_to_unlogged=True).groups.add(group)
     def test_cells_visibility_anonymous(app, cell_visibility_setup):
         response = app.get('/test/')
         assert 'Always visible' in response
         assert 'Visible to unlogged only' in response
         assert 'Visible to logged only' not in response
         assert 'Visible only to member of group' not in response
         assert 'Visible only to non-member of group' not in response
         assert response.pyquery('.shown-because-admin').text() == ''
     def test_cells_visibility_user(app, cell_visibility_setup):
         User.objects.create(username='user')
         response = app.get('/test/', user='user')
         assert 'Always visible' in response
         assert 'Visible to unlogged only' not in response
         assert 'Visible to logged only' in response
         assert 'Visible only to member of group' not in response
         assert 'Visible only to non-member of group' in response
         assert response.pyquery('.shown-because-admin').text() == ''
     def test_cells_visibility_user_with_role(app, cell_visibility_setup, group):
         User.objects.create(username='user').groups.add(group)
         response = app.get('/test/', user='user')
         assert 'Always visible' in response
         assert 'Visible to unlogged only' not in response
         assert 'Visible to logged only' in response
         assert 'Visible only to member of group' in response
         assert 'Visible only to non-member of group' not in response
         assert response.pyquery('.shown-because-admin').text() == ''
     def test_cells_visibility_superuser(app, cell_visibility_setup):
         User.objects.create(username='superuser', is_superuser=True)
         response = app.get('/test/', user='superuser')
         assert 'Always visible' in response
         assert 'Visible to unlogged only' not in response
         assert 'Visible to logged only' in response
         assert 'Visible only to member of group' in response
         assert 'Visible only to non-member of group' in response
         assert response.pyquery('.shown-because-admin').text() == 'Visible only to member of group'
     def test_cells_visibility_superuser_with_role(app, cell_visibility_setup, group):
         User.objects.create(username='superuser', is_superuser=True).groups.add(group)
         response = app.get('/test/', user='superuser')
         assert 'Always visible' in response
         assert 'Visible to unlogged only' not in response
         assert 'Visible to logged only' in response
         assert 'Visible only to member of group' in response
         assert 'Visible only to non-member of group' in response
         assert response.pyquery('.shown-because-admin').text() == 'Visible only to non-member of group'

       vobject
       django-ratelimit<3
       git+http://git.entrouvert.org/debian/django-ckeditor.git
       pyquery
     commands =
       ./getlasso3.sh
       python manage.py compilemessages
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

0001-misc-fix-shown_because_admin-has-no-role-and-cell.re.patch