enhanced changing Activities block

cao_sunyata.code-workspace

@@ -0,0 +1,13 @@
+{
+	"folders": [
+		{
+			"path": "."
+		},
+		{
+			"path": "../ctp_blogr"
+		},
+		{
+			"path": "../caotek_portal"
+		}
+	]
+}

cao_sunyata/templates/home.jinja2

@@ -65,7 +65,7 @@
   <!-- Container (ACTIVITES Section) -->
   {{ activities | safe }}
   {% if request.authenticated_userid %}
-    <div class="text-center"><a href="/topic/_admin">Modifier les activités</a></div>
+    <div class="text-center"><a href="/blog/134/activites-%253A-affiche-sur-homepage">Modifier "Nos activités"</a></div>
   {% endif %}
 
   <!-- Container (POSTS Section) -->

cao_sunyata/templates/login.jinja2

@@ -8,6 +8,7 @@
 
     <form action="{{ login_url }}" method="post">
         <h2>Se connecter</h2>
+        <input type="hidden" name="came_from" value="{{ came_from }}" />
 
         <div class="form-group">
             <input type="text" name="username" class="form-control" placeholder="Identifiant">
@@ -16,7 +17,7 @@
             <input type="password" name="password" class="form-control" placeholder="Mot de passe">
         </div>
         <div class="form-group">
-            <input type="submit" value="Se connecter" class="btn btn-primary">
+            <input type="submit" name="form.submitted" value="Se connecter" class="btn btn-primary">
         </div>
     </form>
 

cao_sunyata/views/default.py

@@ -143,21 +143,21 @@ def settings(request):
 @view_config(route_name='login', renderer='cao_sunyata:templates/login.jinja2')
 @forbidden_view_config(renderer='cao_sunyata:templates/login.jinja2')
 def login(request):
-    username = request.POST.get('username')
     login_url = request.route_url('login')
-
     referrer = request.url
     if referrer == login_url:
         referrer = '/' # never use the login form itself as came_from
 
     came_from = request.params.get('came_from', referrer)
-    username = request.POST.get('username')
+    username = ''
-    userpwd = request.POST.get('password')
+    userpwd = ''
-    if username:
+    if 'form.submitted' in request.params:
+        username = request.POST.get('username')
+        userpwd = request.POST.get('password')
         user = UserService.by_name(request, username)
         if user and user.verify_password(userpwd):
             headers = remember(request, username)
-            request.session.flash("Bonjour %s, Bienvenue sur le site !" % username, 'success')
+            request.session.flash("Bienvenue %s !" % username, 'success')
             return HTTPFound(location=came_from, headers=headers)
         else:
             headers = forget(request)

setup.py

@@ -18,7 +18,7 @@ requires = [
     'pyramid_mailer',
     'pyramid_retry',
     'pyramid_tm',
-    'SQLAlchemy',
+    'SQLAlchemy==1.4.49',
     'transaction',
     'zope.sqlalchemy',
     'wtforms',  # form library
@@ -28,7 +28,7 @@ requires = [
     'Pillow == 8.0.1',
 	'unidecode',
 	'markdown',
-    'urllib3',
+    'urllib3==1.26',
 ]
 
 tests_require = [