0001-pages-add-a-flag-root_for_search-40224.patch

Lauréline Guérin, 26 mars 2020 14:37

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

Subject: [PATCH 1/2] pages: add a flag root_for_search (#40224)

 .../migrations/0046_search_on_root_page.py    | 19 +++++++++++++++++++
 combo/data/models.py                          |  2 ++
 combo/manager/forms.py                        |  6 ++++++
 combo/manager/templates/combo/page_view.html  |  6 ++++++
 combo/manager/urls.py                         |  4 +++-
 combo/manager/views.py                        |  9 +++++++++
 tests/test_manager.py                         | 13 +++++++++++++
 7 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 combo/data/migrations/0046_search_on_root_page.py

     # -*- coding: utf-8 -*-
     from __future__ import unicode_literals
     from django.db import migrations, models
     class Migration(migrations.Migration):
         dependencies = [
             ('data', '0045_link_list_limit'),
+        ]
         operations = [
             migrations.AddField(
                 model_name='page',
                 name='root_for_search',
                 field=models.BooleanField(default=False, verbose_name='Root for search'),
             ),
+        ]

         picture = models.ImageField(_('Picture'), upload_to='page-pictures/', null=True)
         root_for_search = models.BooleanField(_('Root for search'), default=False)
         # mark temporarily restored snapshots, it is required to save objects
         # (pages and cells) for real for viewing past snapshots as many cells are
         # asynchronously loaded and must refer to a real Page object.

             return self.instance
     class PageEditRootForSearchForm(forms.ModelForm):
         class Meta:
             model = Page
             fields = ['root_for_search']
     class CellVisibilityForm(forms.Form):
         visibility = forms.ChoiceField(
                 label=_('Visibility'),

     (<a rel="popup" href="{% url 'combo-manager-page-edit-include-in-navigation' pk=object.id %}">{% trans 'change' %}</a>)
     </p>
     <p>
     <label>{% trans 'Is root for search:' %}</label>
     {{ object.root_for_search|yesno }}
     (<a rel="popup" href="{% url 'combo-manager-page-edit-root-for-search' pk=object.id %}">{% trans 'change' %}</a>)
     </p>
     <p>
     <label>{% trans 'Redirection:' %}</label>
     {% if object.redirect_url %}{{ object.redirect_url }}{% else %}<i>{% trans 'none' %}</i>{% endif %}

     # You should have received a copy of the GNU Affero General Public License
     # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     from django.conf.urls import url, include
     from django.conf.urls import url
     from django.contrib.admin.views.decorators import staff_member_required
     from django.views.decorators.cache import never_cache
-...
                 name='combo-manager-page-edit-redirection'),
             url(r'^pages/(?P<pk>\d+)/include-in-navigation$', views.page_edit_include_in_navigation,
                 name='combo-manager-page-edit-include-in-navigation'),
             url(r'^pages/(?P<pk>\d+)/root-for-search$', views.page_edit_root_for_search,
                 name='combo-manager-page-edit-root-for-search'),
             url(r'^pages/(?P<pk>\d+)/slug$', views.page_edit_slug,
                 name='combo-manager-page-edit-slug'),
             url(r'^pages/(?P<pk>\d+)/title$', views.page_edit_title,

     from .forms import (PageEditTitleForm, PageVisibilityForm, SiteImportForm,
             PageEditRedirectionForm, PageSelectTemplateForm, PageEditSlugForm,
             PageEditPictureForm, PageEditIncludeInNavigationForm,
             PageEditRootForSearchForm,
             PageEditDescriptionForm, CellVisibilityForm)
-...
     page_edit_include_in_navigation = PageEditIncludeInNavigationView.as_view()
     class PageEditRootForSearchView(PageEditView):
         form_class = PageEditRootForSearchForm
         comment = _('changed root for search')
     page_edit_root_for_search = PageEditRootForSearchView.as_view()
     class PageEditSlugView(PageEditView):
         form_class = PageEditSlugForm
         comment = _('changed slug')

         assert page.title == 'Home'
         assert page.template_name == 'standard'  # first one was taken
         assert page.exclude_from_navigation is True
         assert page.root_for_search is False
     def test_add_second_page(app, admin_user):
-...
         resp = resp.form.submit()
         resp = resp.follow()
         assert Page.objects.all()[0].exclude_from_navigation is False
         # is root for search
         resp = resp.click(href='.*/root-for-search')
         resp.form['root_for_search'].checked = True
         resp = resp.form.submit()
         resp = resp.follow()
         assert Page.objects.all()[0].root_for_search is True
         # is not root for search
         resp = resp.click(href='.*/root-for-search')
         resp.form['root_for_search'].checked = False
         resp = resp.form.submit()
         resp = resp.follow()
         assert Page.objects.all()[0].root_for_search is False
     def test_edit_page_cell_invalid_placeholder(app, admin_user):
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

0001-pages-add-a-flag-root_for_search-40224.patch