From 6045ab3e36cae2a855cfa76d19e5804bec2c559c Mon Sep 17 00:00:00 2001
From: Phuoc CAO <phuoc@caotek.fr>
Date: Wed, 28 Jun 2023 15:41:55 +0200
Subject: [PATCH] deboguer erreur dans user_edit

---
 cao_blogr.sqlite                     | Bin 32768 -> 32768 bytes
 cao_blogr/forms.py                   |   2 +-
 cao_blogr/templates/user_edit.jinja2 |  17 +++++++++--
 cao_blogr/views/default.py           |  44 ++++++++++++++-------------
 4 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/cao_blogr.sqlite b/cao_blogr.sqlite
index 39f12094211af57887afd6712191d82e4f29528f..c85b2af1c15f6eff1eac3497f5c333d5d12ba4a9 100644
GIT binary patch
delta 179
zcmZo@U}|V!njp=nJ5k1&RhL0e;>5<3YQOsMfT+B{3}dsDOmDZ+{B%PV=gQzJU%jjV
zud0xU5Fhi9s`6k9L+>2Z6ptL2py0%0i_&Dz^7LX?uk1i`uktJ(pYpOWi}2*C0(1Xh
zQ_sv|kEF^dQ)jb~oRrWCLyKTX=fHvt4}Bv8BV%0yGhHJK1w#WXLklZob3F?~V`C;$
d)5!_`{enPYQ!7JDD^qhlQ*%QzV}nHj1^@+kHGlvB

delta 179
zcmZo@U}|V!njp=nI#I@%Rh2<6+-qY>wO_qgzNNFXL0P78azKucdugSLVVZxWXK6}`
zubz*)Q$S^2lwm+daj2iAkCAIqa+!&Lxlg)&PGXsNkWWf!zNLjpYI<2lT1J>@v6*GA
zdzqeBwqr(QNS>otdU;7zn3-jvOSq?tw}Fv?k+H6UnXZw!f}y#UiLsT5rJlKkr6rSv
b`Q!xuenGIXsiBprk)FA+g{8UKq5uN`rH?fW

diff --git a/cao_blogr/forms.py b/cao_blogr/forms.py
index 0e929aa..304093d 100644
--- a/cao_blogr/forms.py
+++ b/cao_blogr/forms.py
@@ -32,5 +32,5 @@ class UserCreateForm(Form):
                            filters=[strip_filter])
     password = PasswordField('Mot de passe')
 
-    confirm = PasswordField('Confirmer', validators=[EqualTo('password', message='Les 2 Passwords doivent être identiques')])
+    confirm = PasswordField('Confirmer', validators=[EqualTo('password', message='Les 2 mots de passe doivent être identiques')])
 
diff --git a/cao_blogr/templates/user_edit.jinja2 b/cao_blogr/templates/user_edit.jinja2
index 64c1982..d274a45 100644
--- a/cao_blogr/templates/user_edit.jinja2
+++ b/cao_blogr/templates/user_edit.jinja2
@@ -2,15 +2,25 @@
 
 {% block content %}
 
+    {% if message %}
+        <div class="alert alert-danger">
+            {{ message }}
+        </div>
+    {% endif %}
+
     <form action="{{ url }}" method="post" class="form">
 
         {% for error in form.name.errors %}
-            <div class="error">{{ error }}</div>
+            <div class="label label-warning">{{ error }}</div>
         {% endfor %}
 
         <div class="form-group">
             <label class="required-field" for="name">{{form.name.label}}</label>
-            {{form.name(class_='form-control')}}
+            {% if form.id.data  %}
+                <input class="form-control" name="name" readonly type="text" value="{{form.name.data}}">
+            {% else %}
+                {{form.name(class_='form-control')}}
+            {% endif %}
         </div>
 
         <div class="form-group">
@@ -19,7 +29,7 @@
         </div>
 
         {% for error in form.confirm.errors %}
-            <div class="error">{{error}}</div>
+            <div class="label label-danger">{{error}}</div>
         {% endfor %}
 
         <div class="form-group">
@@ -27,6 +37,7 @@
             {{form.confirm(class_='form-control')}}
         </div>
 
+        <br>
         <div class="form-group">					
             <a class="btn btn-default" href="{{ url_retour }}"><span class="glyphicon glyphicon-chevron-left"></span> Retour</a>
             <button class="btn btn-primary" type="submit" name="form.submitted">
diff --git a/cao_blogr/views/default.py b/cao_blogr/views/default.py
index 09be545..80b6b34 100644
--- a/cao_blogr/views/default.py
+++ b/cao_blogr/views/default.py
@@ -86,7 +86,7 @@ def users(request):
 
 @view_config(route_name='user_edit', renderer='cao_blogr:templates/user_edit.jinja2', permission='view')
 def user_edit(request):
-
+    message = ''
     name = request.matchdict['name']
     url = request.route_url('user_edit', name=name)
     if request.authenticated_userid == 'admin':
@@ -111,30 +111,31 @@ def user_edit(request):
 
 
     if 'form.submitted' in request.params and form.validate():
-        if name == '0':
-            # controle que le password a moins 6 car
-            if len(form.password.data) < 6 :
-                request.session.flash(u"Le mot de passe doit avoir au moins 6 caractères", 'danger')
-                return HTTPFound(location=url)
-
+        # controle que le password a moins 6 car
+        if len(form.password.data) < 6 :
+            message = "Le mot de passe doit avoir au moins 6 caractères"
+        else:
             # controler que le nouvel user n'existe pas dans la BD 
             new_user = UserService.by_name(request, form.name.data)
             if new_user:
-                request.session.flash("Utilisateur déjà créé : %s" % form.name.data, 'danger')
-                return HTTPFound(location=url)
+                message = "Utilisateur déjà créé : %s" % form.name.data
+                
+        # si pas d'erreur
+        if message == '':
+            if name == '0':                
+                form.populate_obj(user)
+                user.set_password(form.password.data.encode('utf8'))
+                # créer le nouveau
+                request.dbsession.add(user)
+                request.session.flash("La fiche a été créée avec succès.", 'success')
+                return HTTPFound(location=url_retour)
 
-            form.populate_obj(user)
-            user.set_password(form.password.data.encode('utf8'))
-            # créer le nouveau
-            request.dbsession.add(user)
-            request.session.flash("La fiche a été créée avec succès.", 'success')
-            return HTTPFound(location=url_retour)
-        else:
-            del form.name  # SECURITY: prevent overwriting of primary key
-            form.populate_obj(user)
-            user.set_password(form.password.data.encode('utf8'))
-            request.session.flash("La fiche a été modifiée avec succès.", 'success')
-            return HTTPFound(location=url_retour)
+            else:
+                del form.name  # SECURITY: prevent overwriting of primary key
+                form.populate_obj(user)
+                user.set_password(form.password.data.encode('utf8'))
+                request.session.flash("La fiche a été modifiée avec succès.", 'success')
+                return HTTPFound(location=url_retour)
     
     if 'form.deleted' in request.params:
         UserService.delete(request, user.id)
@@ -143,6 +144,7 @@ def user_edit(request):
 
     return {
         'page_title': page_title,
+        'message': message,
         'form': form, 
         'url': url,
         'url_retour': url_retour,