0001-general-add-possibility-to-redirect-to-a-first-login.patch

Frédéric Péters, 11 avril 2017 15:58

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

Subject: [PATCH] general: add possibility to redirect to a "first login" page
 (#6705)

 combo/profile/__init__.py                |  0
 combo/profile/migrations/0001_initial.py | 23 +++++++++++++++++++++++
 combo/profile/migrations/__init__.py     |  0
 combo/profile/models.py                  | 23 +++++++++++++++++++++++
 combo/public/views.py                    | 12 ++++++++++++
 combo/settings.py                        |  4 ++++
 tests/test_public.py                     | 19 +++++++++++++++++++
 7 files changed, 81 insertions(+)
 create mode 100644 combo/profile/__init__.py
 create mode 100644 combo/profile/migrations/0001_initial.py
 create mode 100644 combo/profile/migrations/__init__.py
 create mode 100644 combo/profile/models.py

     # -*- coding: utf-8 -*-
     from __future__ import unicode_literals
     from django.db import migrations, models
     from django.conf import settings
     class Migration(migrations.Migration):
         dependencies = [
             migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ]
         operations = [
             migrations.CreateModel(
                 name='Profile',
                 fields=[
                     ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                     ('welcome_message_view_timestamp', models.DateTimeField(null=True)),
                     ('user', models.OneToOneField(to=settings.AUTH_USER_MODEL)),
                 ],
             ),
+        ]

     # combo - content management system
     # Copyright (C) 2014-2017  Entr'ouvert
+    #
     # This program is free software: you can redistribute it and/or modify it
     # under the terms of the GNU Affero General Public License as published
     # by the Free Software Foundation, either version 3 of the License, or
     # (at your option) any later version.
+    #
     # This program is distributed in the hope that it will be useful,
     # but WITHOUT ANY WARRANTY; without even the implied warranty of
     # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     # GNU Affero General Public License for more details.
+    #
     # 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 import settings
     from django.db import models
     class Profile(models.Model):
         user = models.OneToOneField(settings.AUTH_USER_MODEL)
         welcome_message_view_timestamp = models.DateTimeField(null=True)

             HttpResponsePermanentRedirect)
     from django.shortcuts import render, resolve_url
     from django.template import RequestContext, loader
     from django.utils import timezone
     if django.VERSION >= (1, 8):
         from django.utils import lorem_ipsum
-...
         get_idps = lambda: []
     from combo.data.models import CellBase, Page, ParentContentCell, TextCell
     from combo.profile.models import Profile
     from combo.apps.search.models import SearchCell
     from combo import utils
-...
             return HttpResponsePermanentRedirect('/')
         if not parts:
             parts = ['index']
         if parts == ['index'] and settings.COMBO_INITIAL_LOGIN_PAGE_PATH and (
                 request.user and not request.user.is_anonymous()):
             profile, created = Profile.objects.get_or_create(user=request.user)
             if not profile.welcome_message_view_timestamp:
                 # first connection of user, record that and redirect to welcome URL
                 profile.welcome_message_view_timestamp = timezone.now()
                 profile.save()
                 return HttpResponseRedirect(settings.COMBO_INITIAL_LOGIN_PAGE_PATH)
         try:
             page = Page.objects.get(slug=parts[-1])
         except Page.DoesNotExist:

         'gadjo',
         'cmsplugin_blurp',
         'combo.data',
         'combo.profile',
         'combo.manager',
         'combo.public',
         'combo.apps.wcs',
-...
     JSON_CELL_TYPES = {}
     # page to redirect the first time the user logs in.
     COMBO_INITIAL_LOGIN_PAGE_PATH = None
     local_settings_file = os.environ.get('COMBO_SETTINGS_FILE',
             os.path.join(os.path.dirname(__file__), 'local_settings.py'))

         resp = app.get(reverse('combo-public-ajax-page-cell',
             kwargs={'page_pk': page.id, 'cell_reference': cell.get_reference()}),
             status=403)
     def test_welcome_page(app, admin_user):
         Page.objects.all().delete()
         page = Page(title='Home', slug='index', template_name='standard')
         page.save()
         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)
             # first visit
             app = login(app)
             resp = app.get('/', status=302)
             assert resp.location == 'http://testserver/initial-login/'
             # visit again
             resp = app.get('/', status=200)
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

0001-general-add-possibility-to-redirect-to-a-first-login.patch