0001-public-add-page-selector-in-site-settings-58475.patch

Valentin Deniaud, 10 novembre 2021 16:59

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

Subject: [PATCH] public: add page selector in site settings (#58475)

 combo/data/migrations/0049_sitesettings.py    |  8 ++--
 .../migrations/0051_auto_20211110_1521.py     | 40 +++++++++++++++++++
 combo/data/models.py                          | 26 ++++++++++--
 combo/manager/forms.py                        |  6 +++
 .../templates/combo/site_settings.html        | 12 ++++++
 combo/public/views.py                         | 14 +++++--
 tests/test_manager.py                         | 12 ++++++
 tests/test_public.py                          | 23 +++++++++++
 8 files changed, 129 insertions(+), 12 deletions(-)
 create mode 100644 combo/data/migrations/0051_auto_20211110_1521.py

                         '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.',
                             verbose_name='',
                             help_text='Path or full URL.',
                             blank=True,
                         ),
                     ),
-...
                         '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.',
                             verbose_name='',
                             help_text='Path or full URL.',
                             blank=True,
                         ),
                     ),

     # Generated by Django 2.2.19 on 2021-11-10 14:21
     import django.db.models.deletion
     from django.db import migrations, models
     class Migration(migrations.Migration):
         dependencies = [
             ('data', '0050_populate_site_settings'),
+        ]
         operations = [
             migrations.AddField(
                 model_name='sitesettings',
                 name='initial_login_page',
                 field=models.ForeignKey(
                     blank=True,
                     null=True,
                     on_delete=django.db.models.deletion.SET_NULL,
                     related_name='+',
                     to='data.Page',
                     verbose_name='Initial login page',
                     help_text='Page to redirect to the first time user logs in.',
                 ),
             ),
             migrations.AddField(
                 model_name='sitesettings',
                 name='welcome_page',
                 field=models.ForeignKey(
                     blank=True,
                     null=True,
                     on_delete=django.db.models.deletion.SET_NULL,
                     related_name='+',
                     to='data.Page',
                     verbose_name='Welcome page',
                     help_text='Page to redirect to on the first visit, to suggest user to log in.',
                 ),
             ),
+        ]

     class SiteSettings(models.Model):
         welcome_page_path = models.CharField(
             _('Welcome page path'),
         welcome_page = models.ForeignKey(
             to=Page,
             verbose_name=_('Welcome page'),
             on_delete=models.SET_NULL,
             null=True,
             blank=True,
             related_name='+',
             help_text=_('Page to redirect to on the first visit, to suggest user to log in.'),
+        )
         welcome_page_path = models.CharField(
             verbose_name='',
             help_text=_('Path or full URL.'),
             max_length=100,
             blank=True,
+        )
         initial_login_page_path = models.CharField(
             _('Initial login page path'),
         initial_login_page = models.ForeignKey(
             to=Page,
             verbose_name=_('Initial login page'),
             help_text=_('Page to redirect to the first time user logs in.'),
             on_delete=models.SET_NULL,
             null=True,
             blank=True,
             related_name='+',
+        )
         initial_login_page_path = models.CharField(
             verbose_name='',
             help_text=_('Path or full URL.'),
             max_length=100,
             blank=True,
+        )

         class Meta:
             model = SiteSettings
             fields = '__all__'
         def __init__(self, *args, **kwargs):
             super().__init__(*args, **kwargs)
             self.fields['welcome_page'].empty_label = _('Custom URL')
             self.fields['initial_login_page'].empty_label = _('Custom URL')
             self.fields['welcome_page'].queryset = self.fields['welcome_page'].queryset.filter(public=True)

         <button class="submit-button">{% trans "Save" %}</button>
         <a class="cancel" href="{% url 'combo-manager-homepage' %}">{% trans 'Cancel' %}</a>
       </div>
       <script>
       $('select').change(function(){
         field_id = $(this).attr('id')
         custom_url_field_id = '#' + field_id + '_path'
         if ($(this).val() == '')
           $(custom_url_field_id).parent('p').show();
         else
           $(custom_url_field_id).parent('p').hide();
       });
       $('select').trigger('change');
       </script>
     </form>
     {% endblock %}

         site_settings = SiteSettings.objects.get()
         if (
             parts == ['index']
             and site_settings.initial_login_page_path
             and (site_settings.initial_login_page or 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()
                 page_path = utils.get_templated_url(site_settings.initial_login_page_path)
                 if site_settings.initial_login_page:
                     page_path = site_settings.initial_login_page.get_online_url()
                 else:
                     page_path = utils.get_templated_url(site_settings.initial_login_page_path)
                 return HttpResponseRedirect(page_path)
         if (
             parts == ['index']
             and site_settings.welcome_page_path
             and (site_settings.welcome_page or 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
                 page_path = utils.get_templated_url(site_settings.welcome_page_path)
                 if site_settings.welcome_page:
                     page_path = site_settings.welcome_page.get_online_url()
                 else:
                     page_path = utils.get_templated_url(site_settings.welcome_page_path)
                 return HttpResponseRedirect(page_path)
         try:

     def test_site_settings(app, admin_user):
         public_page = Page.objects.create(title='Public', slug='public')
         private_page = Page.objects.create(title='Private', slug='private', public=False)
         app = login(app)
         resp = app.get('/manage/')
-...
         site_settings.refresh_from_db()
         assert site_settings.welcome_page_path == ''
         assert site_settings.initial_login_page_path == ''
         assert list(resp.context['form'].fields['welcome_page'].queryset) == [public_page]
         assert list(resp.context['form'].fields['initial_login_page'].queryset) == [public_page, private_page]
         resp.form['welcome_page'].select(text='Public')
         resp.form['initial_login_page'].select(text='Private')
         resp.form.submit()
         site_settings.refresh_from_db()
         assert site_settings.welcome_page == public_page
         assert site_settings.initial_login_page == private_page

             resp = app.get('/', status=302)
             assert resp.location == 'https://authentic.example.org/bar/'
         profile.initial_login_view_timestamp = None
         profile.save(update_fields=['initial_login_view_timestamp'])
         site_settings.initial_login_page = page
         site_settings.save()
         # 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)
     def test_welcome_page(app, admin_user):
         Page.objects.all().delete()
-...
             resp = app.get('/', status=302)
             assert resp.location == 'https://authentic.example.org/bar/'
         site_settings.welcome_page = page
         site_settings.save()
         app.cookiejar.clear()
         resp = app.get('/', status=302)
         assert urllib.parse.urlparse(resp.location).path == '/welcome/'
         resp = app.get('/', status=200)
     def test_post_cell(app):
         Page.objects.all().delete()
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

0001-public-add-page-selector-in-site-settings-58475.patch