diff --git a/cao_sunyata.code-workspace b/cao_sunyata.code-workspace new file mode 100644 index 0000000..6d86189 --- /dev/null +++ b/cao_sunyata.code-workspace @@ -0,0 +1,13 @@ +{ + "folders": [ + { + "path": "." + }, + { + "path": "../ctp_blogr" + }, + { + "path": "../caotek_portal" + } + ] +} \ No newline at end of file diff --git a/cao_sunyata/templates/home.jinja2 b/cao_sunyata/templates/home.jinja2 index cd5722c..7505831 100644 --- a/cao_sunyata/templates/home.jinja2 +++ b/cao_sunyata/templates/home.jinja2 @@ -65,7 +65,7 @@ {{ activities | safe }} {% if request.authenticated_userid %} -
Modifier les activités
+
Modifier "Nos activités"
{% endif %} diff --git a/cao_sunyata/templates/login.jinja2 b/cao_sunyata/templates/login.jinja2 index c7cc2c3..134d0c5 100644 --- a/cao_sunyata/templates/login.jinja2 +++ b/cao_sunyata/templates/login.jinja2 @@ -8,6 +8,7 @@

Se connecter

+
@@ -16,7 +17,7 @@
- +
diff --git a/cao_sunyata/views/default.py b/cao_sunyata/views/default.py index a577a75..c9f69ef 100644 --- a/cao_sunyata/views/default.py +++ b/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') - userpwd = request.POST.get('password') - if username: + username = '' + userpwd = '' + 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) diff --git a/setup.py b/setup.py index 6cec6c5..fa54f07 100644 --- a/setup.py +++ b/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 = [