0001-data-add-site-settings-model-to-configure-welcome-ur.patch

Valentin Deniaud, 31 août 2021 16:00

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

Subject: [PATCH] data: add site settings model to configure welcome urls
 (#15846)

 combo/data/migrations/0048_sitesettings.py    | 38 ++++++++++++++++
 .../migrations/0049_populate_site_settings.py | 25 +++++++++++
 combo/data/models.py                          | 13 ++++++
 combo/manager/forms.py                        |  8 +++-
 .../manager/templates/combo/manager_home.html |  1 +
 .../templates/combo/site_settings.html        | 18 ++++++++
 combo/manager/urls.py                         |  1 +
 combo/manager/views.py                        | 15 ++++++-
 combo/public/views.py                         | 10 +++--
 combo/settings.py                             |  6 ---
 tests/test_manager.py                         | 15 +++++++
 tests/test_public.py                          | 45 +++++++++++--------
 tests/test_wcs.py                             |  2 +-
 13 files changed, 165 insertions(+), 32 deletions(-)
 create mode 100644 combo/data/migrations/0048_sitesettings.py
 create mode 100644 combo/data/migrations/0049_populate_site_settings.py
 create mode 100644 combo/manager/templates/combo/site_settings.html

     # Generated by Django 2.2.19 on 2021-08-25 14:12
     from django.db import migrations, models
     class Migration(migrations.Migration):
         dependencies = [
             ('data', '0047_auto_20210723_1318'),
+        ]
         operations = [
             migrations.CreateModel(
                 name='SiteSettings',
                 fields=[
+                    (
                         'id',
                         models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
                     ),
+                    (
                         'initial_login_page_path',
                         models.CharField(
                             max_length=100,
                             verbose_name='Initial login page path',
                             help_text='Page to redirect to the first time user logs in.',
                         ),
                     ),
+                    (
                         'welcome_page_path',
                         models.CharField(
                             max_length=100,
                             verbose_name='Welcome page path',
                             help_text='Page to redirect to on the first visit, to suggest user to log in.',
                         ),
                     ),
                 ],
             ),
+        ]

     # Generated by Django 2.2.19 on 2021-08-31 10:10
     from django.conf import settings
     from django.db import migrations
     def create_site_settings(apps, schema_editor):
         SiteSettings = apps.get_model('data', 'SiteSettings')
         site_settings = SiteSettings.objects.create()
         if hasattr(settings, 'COMBO_INITIAL_LOGIN_PAGE_PATH'):
             site_settings.initial_login_page_path = settings.COMBO_INITIAL_LOGIN_PAGE_PATH or ''
         if hasattr(settings, 'COMBO_WELCOME_PAGE_PATH'):
             site_settings.welcome_page_path = settings.COMBO_WELCOME_PAGE_PATH or ''
         site_settings.save()
     class Migration(migrations.Migration):
         dependencies = [
             ('data', '0048_sitesettings'),
+        ]
         operations = [
             migrations.RunPython(create_site_settings),
+        ]

             page.save(update_fields=['last_update_timestamp'])
             return
         page.build_cell_cache()
     class SiteSettings(models.Model):
         initial_login_page_path = models.CharField(
             _('Initial login page path'),
             help_text=_('Page to redirect to the first time user logs in.'),
             max_length=100,
+        )
         welcome_page_path = models.CharField(
             _('Welcome page path'),
             help_text=_('Page to redirect to on the first visit, to suggest user to log in.'),
             max_length=100,
+        )

     from django.template.loader import TemplateDoesNotExist, get_template
     from django.utils.translation import ugettext_lazy as _
     from combo.data.models import Page, ParentContentCell, compile_sub_slug
     from combo.data.models import Page, ParentContentCell, SiteSettings, compile_sub_slug
     from .fields import ImageIncludingSvgField
-...
         assets = forms.BooleanField(label=_('Assets'), required=False, initial=True)
         asset_files = forms.BooleanField(label=_('Assets Files'), required=False, initial=False)
         payment = forms.BooleanField(label=_('Online Payment'), required=False, initial=True)
     class SiteSettingsForm(forms.ModelForm):
         class Meta:
             model = SiteSettings
             fields = '__all__'

combo/manager/templates/combo/manager_home.html
10	10	<li><a href="{% url 'combo-manager-site-export' %}" rel="popup" data-autoclose-dialog="true">{% trans 'Export Site' %}</a></li>
11	11	<li><a href="{% url 'combo-manager-site-import' %}">{% trans 'Import Site' %}</a></li>
12	12	<li><a href="{% url 'combo-manager-invalid-cell-report' %}">{% trans 'Anomaly report' %}</a></li>
	13	<li><a href="{% url 'combo-manager-site-settings' %}" rel="popup" data-autoclose-dialog="true">{% trans 'Site Settings' %}</a></li>
13	14	{% for extra_action in extra_actions %}
14	15	<li><a href="{{ extra_action.href }}">{{ extra_action.text }}</a></li>
15	16	{% endfor %}

     {% extends "combo/manager_base.html" %}
     {% load i18n %}
     {% block appbar %}
     <h2>{% trans "Site Settings" %}</h2>
     {% endblock %}
     {% block content %}
     <form method="post">
       {% csrf_token %}
       {{ form.as_p }}
       <div class="buttons">
         <button class="submit-button">{% trans "Save" %}</button>
         <a class="cancel" href="{% url 'combo-manager-homepage' %}">{% trans 'Cancel' %}</a>
       </div>
     </form>
     {% endblock %}

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

     from combo import plugins
     from combo.data.library import get_cell_class
     from combo.data.models import CellBase, LinkListCell, Page, PageSnapshot, ParentContentCell
     from combo.data.models import CellBase, LinkListCell, Page, PageSnapshot, ParentContentCell, SiteSettings
     from combo.data.utils import ImportSiteError, export_site, export_site_tar, import_site, import_site_tar
     from .forms import (
-...
         PageVisibilityForm,
         SiteExportForm,
         SiteImportForm,
         SiteSettingsForm,
+    )
-...
             PageSnapshot.take(cell.page, request=request, comment=_('reordered cells'))
         return HttpResponse(status=204)
     class SiteSettingsView(UpdateView):
         form_class = SiteSettingsForm
         template_name = 'combo/site_settings.html'
         success_url = reverse_lazy('combo-manager-homepage')
         def get_object(self):
             return SiteSettings.objects.get()
     site_settings = SiteSettingsView.as_view()

         ParentContentCell,
         PostException,
         Redirect,
         SiteSettings,
         TextCell,
         extract_context_from_sub_slug,
+    )
-...
         if not parts:
             parts = ['index']
         site_settings = SiteSettings.objects.get()
         if (
             parts == ['index']
             and settings.COMBO_INITIAL_LOGIN_PAGE_PATH
             and site_settings.initial_login_page_path
             and (request.user and not request.user.is_anonymous)
         ):
             profile, dummy = Profile.objects.get_or_create(user=request.user)
-...
                 # first connection of user, record that and redirect to welcome URL
                 profile.initial_login_view_timestamp = timezone.now()
                 profile.save()
                 return HttpResponseRedirect(settings.COMBO_INITIAL_LOGIN_PAGE_PATH)
                 return HttpResponseRedirect(site_settings.initial_login_page_path)
         if (
             parts == ['index']
             and settings.COMBO_WELCOME_PAGE_PATH
             and site_settings.welcome_page_path
             and (not request.user or request.user.is_anonymous)
         ):
             if not request.session.setdefault('visited', False):
                 # first visit, the user is not logged in.
                 request.session['visited'] = True
                 return HttpResponseRedirect(settings.COMBO_WELCOME_PAGE_PATH)
                 return HttpResponseRedirect(site_settings.welcome_page_path)
         pages = {}
         for page in Page.objects.filter(slug__in=parts):

     JSON_CELL_TYPES = {}
     # page to redirect the first time the user logs in.
     COMBO_INITIAL_LOGIN_PAGE_PATH = None
     # page to redirect on the first visit, to suggest user to log in.
     COMBO_WELCOME_PAGE_PATH = None
     # dashboard support
     COMBO_DASHBOARD_ENABLED = False

         Page,
         PageSnapshot,
         ParentContentCell,
         SiteSettings,
         TextCell,
         ValidityInfo,
+    )
-...
         for i, item in enumerate(items):
             item.refresh_from_db()
             assert item.order == new_order[i]
     def test_site_settings(app, admin_user):
         app = login(app)
         resp = app.get('/manage/')
         resp = resp.click('Site Settings')
         resp.form['welcome_page_path'] = '/welcome/'
         resp.form['initial_login_page_path'] = '/initial-login/'
         resp.form.submit()
         site_settings = SiteSettings.objects.get()
         assert site_settings.welcome_page_path == '/welcome/'
         assert site_settings.initial_login_page_path == '/initial-login/'

         Page,
         ParentContentCell,
         Redirect,
         SiteSettings,
         TextCell,
+    )
-...
         page = Page(title='Initial Login', slug='initial-login', template_name='standard', public=False)
         page.save()
         with override_settings(COMBO_INITIAL_LOGIN_PAGE_PATH='/initial-login/'):
             resp = app.get('/', status=200)
         site_settings = SiteSettings.objects.get()
         site_settings.initial_login_page_path = '/initial-login/'
         site_settings.save()
             # first visit
             app = login(app)
             resp = app.get('/', status=302)
             assert urllib.parse.urlparse(resp.location).path == '/initial-login/'
         resp = app.get('/', status=200)
         # first visit
         app = login(app)
         resp = app.get('/', status=302)
         assert urllib.parse.urlparse(resp.location).path == '/initial-login/'
             # visit again
             resp = app.get('/', status=200)
         # visit again
         resp = app.get('/', status=200)
     def test_welcome_page(app, admin_user):
-...
         page = Page(title='Welcome', slug='welcome', template_name='standard')
         page.save()
         with override_settings(COMBO_WELCOME_PAGE_PATH='/welcome/'):
             app.cookiejar.clear()
             resp = app.get('/', status=302)
             assert urllib.parse.urlparse(resp.location).path == '/welcome/'
         site_settings = SiteSettings.objects.get()
         site_settings.welcome_page_path = '/welcome/'
         site_settings.save()
             resp = app.get('/', status=200)
         app.cookiejar.clear()
         resp = app.get('/', status=302)
         assert urllib.parse.urlparse(resp.location).path == '/welcome/'
             app.cookiejar.clear()
             resp = app.get('/', status=302)
             assert urllib.parse.urlparse(resp.location).path == '/welcome/'
         resp = app.get('/', status=200)
         app.cookiejar.clear()
         resp = app.get('/', status=302)
         assert urllib.parse.urlparse(resp.location).path == '/welcome/'
             app.cookiejar.clear()
             app = login(app)
             resp = app.get('/', status=200)
         app.cookiejar.clear()
         app = login(app)
         resp = app.get('/', status=200)
     def test_post_cell(app):

         app.get('/')  # load once to populate caches
         with CaptureQueriesContext(connection) as ctx:
             app.get('/')
             assert len(ctx.captured_queries) == 61
             assert len(ctx.captured_queries) == 62
     def test_hourly():
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

0001-data-add-site-settings-model-to-configure-welcome-ur.patch