0001-cells-extra_css_class-for-links-in-link-list-cell-61.patch

Lauréline Guérin, 31 janvier 2022 11:15

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

Subject: [PATCH] cells: extra_css_class for links in link list cell (#61197)

 combo/apps/wcs/forms.py                       |  6 ++++++
 combo/apps/wcs/models.py                      |  5 +++++
 combo/data/forms.py                           |  6 ++++++
 combo/data/models.py                          |  5 +++++
 .../combo/manager/link-list-cell-form.html    |  3 +++
 combo/manager/static/css/combo.manager.css    |  3 ++-
 combo/manager/views.py                        |  4 ++--
 .../templates/combo/link-list-cell.html       |  2 +-
 tests/test_cells.py                           |  6 +++++-
 tests/test_manager.py                         |  7 +++++++
 tests/test_wcs.py                             | 19 ++++++++++++++++---
 11 files changed, 58 insertions(+), 8 deletions(-)

             self.fields['formdef_reference'].widget = forms.Select(choices=formdef_references)
     class WcsFormForLinkListCellForm(WcsFormCellForm):
         class Meta:
             model = WcsFormCell
             fields = ('formdef_reference', 'extra_css_class')
     class WcsCardsCellForm(forms.ModelForm):
         with_user = forms.BooleanField(label=_('Restrict to cards accessible to the user'), required=False)

             return WcsFormCellForm
         def get_form_class_for_link_list_cell(self):
             from .forms import WcsFormForLinkListCellForm
             return WcsFormForLinkListCellForm
         def save(self, *args, **kwargs):
             if 'update_fields' in kwargs:
                 # don't populate the cache

             self.fields['link_page'].widget = forms.Select(choices=[(None, '-----')] + get_page_choices())
     class LinkCellForLinkListCellForm(LinkCellForm):
         class Meta:
             model = LinkCell
             fields = ('title', 'url', 'link_page', 'anchor', 'extra_css_class')
     class LinkListCellForm(forms.ModelForm):
         class Meta:
             model = LinkListCell

             return LinkCellForm
         def get_form_class_for_link_list_cell(self):
             from .forms import LinkCellForLinkListCellForm
             return LinkCellForLinkListCellForm
         def render_for_search(self):
             return ''

        <span title="{{ link }}">
          {{ link|truncatechars:100 }}
          {% with link.get_invalid_reason as invalid_reason %}
          {% if link.extra_css_class %}
          <span class="extra-css-class">[{{ link.extra_css_class }}]</span>
          {% endif %}
          {% if invalid_reason %}
          <span class="invalid">{{ invalid_reason }} -
            {% if cell.get_validity_info.invalid_datetime|datetime_in_past %}

combo/manager/static/css/combo.manager.css
105	105	color: #3c3c33;
106	106	}
107	107
108		div.cell h3 span.extra-css-class {
	108	div.cell h3 span.extra-css-class,
	109	ul.list-of-links span.extra-css-class {
109	110	font-size: 70%;
110	111	opacity: 0.7;
111	112	}

             return super().dispatch(request, *args, **kwargs)
         def get_form_class(self):
             return self.model().get_default_form_class()
             return self.model().get_form_class_for_link_list_cell()
         def get_form_kwargs(self):
             kwargs = super().get_form_kwargs()
-...
             return self.object
         def get_form_class(self):
             return self.model().get_default_form_class()
             return self.model().get_form_class_for_link_list_cell()
         def form_valid(self, form):
             if self.request.is_ajax():

       {% block cell-top-content %}{% endblock cell-top-content %}
       <ul>
       {% for link in links %}
       <li class="{{ link.css_classes|default:""|join:" " }}"><a href="{{ link.url }}">{{ link.title }}</a></li>
       <li class="{{ link.css_classes|default:""|join:" " }}{% if link.cell.extra_css_class %} {{ link.cell.extra_css_class }}{% endif %}"><a href="{{ link.url }}">{{ link.title }}</a></li>
       {% endfor %}
       {% if more_links %}
       <li class="add-more-items">

             title='Example Site',
             url='http://example.net/',
             order=0,
             extra_css_class='foobar',
+        )
         ctx = {'page_cells': [item]}
         assert '<ul><li class=""><a href="http://example.net/">Example Site</a></li></ul>' in cell.render(ctx)
         assert '<ul><li class=" foobar"><a href="http://example.net/">Example Site</a></li></ul>' in cell.render(
             ctx
+        )
         item.title = ''
         item.extra_css_class = ''
         assert '<ul><li class=""><a href="http://example.net/">http://example.net/</a></li></ul>' in cell.render(
             ctx
+        )

         assert JsonCell.objects.first().template_string == '{{ ok }}'
     def test_link_cell_setup():
         form = LinkCellForm()
         assert 'extra_css_class' not in form.fields
     def test_link_cell_validation():
         form = LinkCellForm(data={'url': 'http://example.com'})
         assert form.is_valid() is True
-...
         resp = resp.click(href='.*/add-link/link$')
         resp.forms[0]['title'] = 'Hello world'
         resp.forms[0]['url'] = 'http://example.com'
         resp.forms[0]['extra_css_class'] = 'foobar'
         resp = resp.forms[0].submit()
         assert resp.status_int == 302
         assert resp.location.endswith('/manage/pages/%s/#cell-%s' % (page.pk, cell.get_reference()))
-...
         assert item.url == 'http://example.com'
         assert item.page == page
         assert item.placeholder == cell.link_placeholder
         assert item.extra_css_class == 'foobar'
         assert PageSnapshot.objects.count() == 1
         resp = resp.follow()

             ('other:form-title', 'test2 : form title'),
             ('other:third-form-title', 'test2 : Third form title'),
+        ]
         assert 'extra_css_class' not in form.fields
     @mock.patch('combo.apps.wcs.utils.requests.send', side_effect=mocked_requests_send)
-...
         resp = resp.click(href='.*/add-link/form-link$')
         resp.forms[0]['formdef_reference'] = 'default:form-title'
         resp.forms[0]['extra_css_class'] = 'foobar'
         resp = resp.forms[0].submit()
         assert resp.status_int == 302
         assert resp.location.endswith('/manage/pages/%s/#cell-%s' % (page.pk, cell.get_reference()))
-...
         assert item.formdef_reference == 'default:form-title'
         assert item.page == page
         assert item.placeholder == cell.link_placeholder
         assert item.extra_css_class == 'foobar'
         resp = resp.follow()
         resp = resp.click(href='.*/link/%s/$' % item.get_reference())
-...
         page.save()
         cell = LinkListCell.objects.create(order=0, placeholder='content', page=page)
         WcsFormCell.objects.create(
         link = WcsFormCell.objects.create(
             page=page,
             placeholder=cell.link_placeholder,
             cached_title='A title',
             cached_url='http://example.com/',
             cached_json={'keywords': ['bar']},
             order=0,
             extra_css_class='foobar',
+        )
         resp = app.get('/test_list_of_links_with_form_render/')
         assert PyQuery(resp.text).find('.links-list a').text() == 'A title'
         assert PyQuery(resp.text).find('.links-list li').attr('class') == 'keyword-bar'
         assert PyQuery(resp.text).find('.links-list li').attr('class') == ' foobar'
         assert (
             PyQuery(resp.text).find('.links-list a').attr('href')
             == 'http://example.com/tryauth?cancelurl=http%3A//testserver/test_list_of_links_with_form_render/'
+        )
         link.cached_json = {'keywords': ['bar']}
         link.save()
         resp = app.get('/test_list_of_links_with_form_render/')
         assert PyQuery(resp.text).find('.links-list li').attr('class') == 'keyword-bar foobar'
         link.extra_css_class = ''
         link.save()
         resp = app.get('/test_list_of_links_with_form_render/')
         assert PyQuery(resp.text).find('.links-list li').attr('class') == 'keyword-bar'
     def test_view_page_with_wcs_cells_num_queries(app, admin_user):
         page = Page.objects.create(title='bar', slug='index', order=1)
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

0001-cells-extra_css_class-for-links-in-link-list-cell-61.patch