0005-cells-invalid-cell-report-38009.patch

Lauréline Guérin, 02 mars 2020 16:08

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

Subject: [PATCH 5/6] cells: invalid cell report (#38009)

 combo/data/models.py                          |  8 ++++--
 .../templates/combo/invalid_cell_report.html  | 28 +++++++++++++++++++
 .../manager/templates/combo/manager_home.html |  1 +
 combo/manager/urls.py                         |  1 +
 combo/manager/views.py                        | 12 ++++++++
 tests/test_manager.py                         | 23 +++++++++++++++
 6 files changed, 71 insertions(+), 2 deletions(-)
 create mode 100644 combo/manager/templates/combo/invalid_cell_report.html

             return cell_types
         @classmethod
         def get_cells(cls, cell_filter=None, skip_cell_cache=False, prefetch_validity_info=False, **kwargs):
         def get_cells(cls, cell_filter=None, skip_cell_cache=False, prefetch_validity_info=False, select_related=None, **kwargs):
             """Returns the list of cells of various classes matching **kwargs"""
             cells = []
             pages = []
             select_related = select_related or {}
             if 'page' in kwargs:
                 pages = [kwargs['page']]
             elif 'page__in' in kwargs:
-...
                     continue
                 if cell_filter and not cell_filter(klass):
                     continue
                 cells.extend(klass.objects.filter(**kwargs))
                 cells_queryset = klass.objects.filter(**kwargs)
                 if select_related:
                     cells_queryset = cells_queryset.select_related(*select_related)
                 cells.extend(cells_queryset)
             if prefetch_validity_info:
                 validity_info_list = list(ValidityInfo.objects.select_related('content_type'))
                 for cell in cells:

     {% extends "combo/manager_base.html" %}
     {% load i18n %}
     {% block appbar %}
     <h2>{% trans 'Invalid cells' %}</h2>
     {% endblock %}
     {% block breadcrumb %}
       {{ block.super }}
       <a href="{% url 'combo-manager-invalid-cell-report' %}">{% trans 'Anomaly report' %}</a>
     {% endblock %}
     {% block content %}
     {% if object_list %}
     <ul class="objects-list">
       {% for cell in object_list %}
       <li>
           {% trans "Page:" %} <a href="{% url 'combo-manager-page-view' pk=cell.page_id %}">{{ cell.page.title }}</a> -
           {% trans "Cell:" %} <a href="{% url 'combo-manager-page-view' pk=cell.page_id %}#cell-{{ cell.get_reference }}">{{ cell.get_label }}</a>
       </li>
       {% endfor %}
     </ul>
     {% else %}
     <div class="big-msg-info">
       {% trans "No invalid cell found." %}
     </div>
     {% endif %}
     {% endblock %}

combo/manager/templates/combo/manager_home.html
9	9	<ul class="extra-actions-menu">
10	10	<li><a download href="{% url 'combo-manager-site-export' %}">{% trans 'Export Site' %}</a></li>
11	11	<li><a href="{% url 'combo-manager-site-import' %}">{% trans 'Import Site' %}</a></li>
	12	<li><a href="{% url 'combo-manager-invalid-cell-report' %}">{% trans 'Anomaly report' %}</a></li>
12	13	{% for extra_action in extra_actions %}
13	14	<li><a href="{{ extra_action.href }}">{{ extra_action.text }}</a></li>
14	15	{% endfor %}

combo/manager/urls.py
28	28	url(r'^menu.json$', views.menu_json),
29	29	url(r'^site-export$', views.site_export, name='combo-manager-site-export'),
30	30	url(r'^site-import$', views.site_import, name='combo-manager-site-import'),
	31	url(r'^cells/invalid-report/$', views.invalid_cell_report, name='combo-manager-invalid-cell-report'),
31	32	url(r'^pages/add/$', views.page_add, name='combo-manager-page-add'),
32	33	url(r'^pages/(?P<pk>\d+)/$', views.page_view,
33	34	name='combo-manager-page-view'),

     from django.core.urlresolvers import reverse, reverse_lazy
     from django.http import HttpResponse, HttpResponseRedirect, Http404
     from django.shortcuts import redirect
     from django.shortcuts import render
     from django.shortcuts import get_object_or_404
     from django.utils.translation import ugettext_lazy as _
     from django.utils.encoding import force_text, force_bytes
-...
     site_import = SiteImportView.as_view()
     def invalid_cell_report(request):
         invalid_cells = CellBase.get_cells(
             select_related=['page'],
             page__snapshot__isnull=True,
             validity_info__invalid_since__isnull=False)
         context = {
             'object_list': invalid_cells,
+        }
         return render(request, 'combo/invalid_cell_report.html', context)
     class PageAddView(CreateView):
         model = Page
         template_name = 'combo/page_add.html'

         assert 'Missing groups: foobar' in resp.text
     def test_invalid_cell_report(app, admin_user):
         app = login(app)
         resp = app.get('/manage/cells/invalid-report/')
         assert resp.context['object_list'] == []
         page = Page.objects.create(title='One', slug='one', template_name='standard')
         cell = TextCell.objects.create(page=page, placeholder='content', text='Foobar', order=0)
         resp = app.get('/manage/cells/invalid-report/')
         assert resp.context['object_list'] == []
         cell.mark_as_invalid('foo_bar_reason')
         resp = app.get('/manage/cells/invalid-report/')
         assert resp.context['object_list'] == [cell]
         assert '<a href="/manage/pages/{}/">{}</a>'.format(page.pk, page.title) in resp.text
         assert '<a href="/manage/pages/{}/#cell-{}">{}</a>'.format(page.pk, cell.get_reference(), cell.get_label()) in resp.text
         snapshot = PageSnapshot.objects.create(page=page)
         page.snapshot = snapshot
         page.save()
         resp = app.get('/manage/cells/invalid-report/')
         assert resp.context['object_list'] == []
     def test_duplicate_page(app, admin_user):
         page = Page.objects.create(title='One', slug='one', template_name='standard', exclude_from_navigation=False)
         TextCell.objects.create(page=page, placeholder='content', text='Foobar', order=0)
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

0005-cells-invalid-cell-report-38009.patch