From 1c24b993bb1595bd819f8d8ffe23377d71865dd2 Mon Sep 17 00:00:00 2001 From: Phuoc Cao Date: Mon, 16 Dec 2024 18:43:06 +0100 Subject: [PATCH] removed wtform --- cao_sunyata/forms.py | 50 ------------ cao_sunyata/models/entries.py | 77 +++++++++++++++--- cao_sunyata/models/users.py | 7 +- cao_sunyata/templates/blog.jinja2 | 2 +- cao_sunyata/templates/blog_edit.jinja2 | 52 +++++++------ cao_sunyata/templates/blog_search.jinja2 | 11 +-- cao_sunyata/templates/home.jinja2 | 2 +- cao_sunyata/templates/settings.jinja2 | 2 +- cao_sunyata/templates/tag_edit.jinja2 | 22 ++---- cao_sunyata/templates/topic_edit.jinja2 | 36 ++++----- cao_sunyata/views/blog.py | 99 +++++++++++++----------- cao_sunyata/views/default.py | 84 ++++++++++---------- setup.py | 1 - 13 files changed, 222 insertions(+), 223 deletions(-) delete mode 100644 cao_sunyata/forms.py diff --git a/cao_sunyata/forms.py b/cao_sunyata/forms.py deleted file mode 100644 index 6ca2961..0000000 --- a/cao_sunyata/forms.py +++ /dev/null @@ -1,50 +0,0 @@ -from wtforms import Form, StringField, TextAreaField, SelectField, DateTimeField -from wtforms import IntegerField, PasswordField -from wtforms.validators import InputRequired, Length, EqualTo -from wtforms.widgets import HiddenInput - -strip_filter = lambda x: x.strip() if x else None - -class BlogCreateForm(Form): - title = StringField('Titre', validators=[InputRequired(), Length(min=1, max=255)], - filters=[strip_filter]) - body = TextAreaField('Corps du texte', validators=[InputRequired(), Length(min=1)], - filters=[strip_filter]) - tag = SelectField('Tag') - author = StringField('Auteur', validators=[InputRequired(), Length(min=1, max=50)], - filters=[strip_filter]) - status = SelectField('Statut', choices=[('brouillon','Brouillon'),('privé','Privé'),('publié','Publié')]) - created = DateTimeField('Créé le', validators=[InputRequired()]) - - -class BlogUpdateForm(BlogCreateForm): - id = IntegerField(widget=HiddenInput()) - created = DateTimeField('Créé le', validators=[InputRequired()]) - -class BlogSearchForm(Form): - criteria = StringField('Critère', validators=[InputRequired(), Length(min=3, max=45)], - filters=[strip_filter]) - -class UserCreateForm(Form): - id = IntegerField(widget=HiddenInput()) - name = StringField('Nom', validators=[InputRequired(), Length(min=1, max=255)], - filters=[strip_filter]) - password = PasswordField('Mot de passe') - confirm = PasswordField('Confirmer', validators=[EqualTo('password', message='Les 2 Passwords doivent être identiques')]) - -class TopicForm(Form): - topic = StringField('Topic', validators=[InputRequired(), Length(min=1, max=25)], - filters=[strip_filter]) - topic_name = StringField('Intitulé', validators=[InputRequired(), Length(min=1, max=25)], - filters=[strip_filter]) - topic_quote = TextAreaField('Citation', validators=[InputRequired(), Length(min=1)], - filters=[strip_filter]) - - -class TagForm(Form): - id = IntegerField(widget=HiddenInput()) - - tag = StringField('Tag', validators=[InputRequired(), Length(min=1, max=25)], - filters=[strip_filter]) - tag_name = StringField('Intitulé', validators=[InputRequired(), Length(min=1, max=25)], - filters=[strip_filter]) diff --git a/cao_sunyata/models/entries.py b/cao_sunyata/models/entries.py index 31139b4..7558c45 100644 --- a/cao_sunyata/models/entries.py +++ b/cao_sunyata/models/entries.py @@ -4,7 +4,7 @@ from .default import ( ) def get_entries_by_topic(request, topic, tag): - query = f"SELECT * FROM entries WHERE topic_id = {topic}" + query = "SELECT *, strftime('%d/%m/%Y', created) AS create_date FROM entries WHERE topic_id = '{0}'".format(topic) if request.authenticated_userid == None: # if user is anonym, display only published posts query = query + " AND status='publié'" @@ -13,7 +13,7 @@ def get_entries_by_topic(request, topic, tag): # if user is not 'admin', hide admin posts query = query + " AND tag =! '_admin'" if tag != '': - query = query + " AND tag = {tag}" + query = query + " AND tag = '{0}'".format(tag) query = query + " ORDER BY tag, title;" results = request.dbsession.execute(query).fetchall() @@ -21,7 +21,7 @@ def get_entries_by_topic(request, topic, tag): def get_entries_by_criteria(request, criteria): search = "%{}%".format(criteria) - query = f"SELECT * FROM entries WHERE title = {search} or body = {search}" + query = f"SELECT *, strftime('%d/%m/%Y', edited) AS edit_date FROM entries WHERE title like '{search}' or body like '{search}'" if request.authenticated_userid == None: # if user is anonym, display only published posts query = query + " AND status='publié'" @@ -34,13 +34,14 @@ def get_entries_by_criteria(request, criteria): return results def get_entries_by_id(request, _id): - query = "SELECT * FROM entries WHERE id=:id;" + query = """SELECT *, strftime('%d/%m/%Y', created) AS create_date, + strftime('%d/%m/%Y', edited) AS edit_date FROM entries WHERE id=:id;""" results = request.dbsession.execute(query, {'id':_id}).first() return results def get_last_created(request): # gest the 10 last created posts - query = "SELECT strftime('%d/%m/%Y', created) AS create_date, title, author, status FROM entries WHERE topic_id <> '_admin'" + query = "SELECT strftime('%d/%m/%Y', created) AS create_date, id, title, author, status FROM entries WHERE topic_id <> '_admin'" if request.authenticated_userid == None: # if user is anonym, display only published posts query = query + " AND status='publié'" @@ -74,7 +75,7 @@ def get_tags_byTopic(request, topic): def get_tags_byId(request, id): query = "SELECT * FROM tags WHERE id=:id;" - results = request.dbsession.execute(query, {'topic':id}).first() + results = request.dbsession.execute(query, {'id':id}).first() return results def get_topic_byTopic(request, id): @@ -89,15 +90,69 @@ def get_topics(request): results = request.dbsession.execute(query, {'topic':id}).all() return results -def entries_delete(request, id): +def delete_entry(request, id): query = "DELETE FROM entries WHERE id = :id ;" execute_query(request, query, {'id': id}) -def tags_delete(request, id): +def delete_tag(request, id): query = "DELETE FROM tags WHERE id = :id ;" execute_query(request, query, {'id': id}) -def topics_delete(request, id): - query = "DELETE FROM topics WHERE topic = :id ;" - execute_query(request, query, {'id': id}) +def delete_topic(request, topic): + query = "DELETE FROM topics WHERE topic = :topic ;" + execute_query(request, query, {'topic': topic}) +def update_entry(request, blog_id, new_values): + # formater les champs + s = '' + for param in new_values.keys(): + if s: + s += ",%s=:%s" % (param, param) + else: + s = "%s=:%s" % (param, param) + + import pdb;pdb.set_trace() + if blog_id == '0': + query = """INSERT INTO entries (title, body, created, edited, topic_id, tag, author, status, creator, editor) + VALUES ('{0}', '{1}', '{2}', '{3}', '{4}', '{5}', '{6}', '{7}', '{8}', '{8}')""".format( + new_values['title'], new_values['body'], new_values['created'], new_values['created'], + new_values['topic_id'], new_values['tag'], new_values['author'], new_values['status'], + new_values['editor'], new_values['editor'],) + else: + new_values['id'] = blog_id + query = "UPDATE entries SET %s WHERE id = :id;" % s + execute_query(request, query, new_values) + +def update_tag(request, id, new_values): + # formater les champs + s = '' + for param in new_values.keys(): + if s: + s += ",%s=:%s" % (param, param) + else: + s = "%s=:%s" % (param, param) + + if id == '0': + query = "INSERT INTO tags (topic, tag, tag_name) VALUES ('{0}', '{1}', '{2}')".format( + new_values['topic'], new_values['tag'], new_values['tag_name']) + else: + new_values['id'] = id + query = "UPDATE tags SET %s WHERE id = :id;" % s + execute_query(request, query, new_values) + +def update_topic(request, topic, new_values): + # formater les champs + s = '' + for param in new_values.keys(): + if s: + s += ",%s=:%s" % (param, param) + else: + s = "%s=:%s" % (param, param) + + if topic == '0': + query = "INSERT INTO topics (topic, topic_name, topic_quote) VALUES ('{0}', '{1}', '{2}')".format( + topic, new_values['topic_name'], new_values['topic_quote']) + else: + new_values['topic'] = topic + query = "UPDATE topics SET %s WHERE topic = :topic;" % s + execute_query(request, query, new_values) diff --git a/cao_sunyata/models/users.py b/cao_sunyata/models/users.py index 17208a2..cf37c26 100644 --- a/cao_sunyata/models/users.py +++ b/cao_sunyata/models/users.py @@ -42,7 +42,6 @@ def update_user(request, name, new_values): else: s = "%s=:%s" % (param, param) - import pdb;pdb.set_trace() if name == '0': query = "INSERT INTO users (name, password) VALUES ('{0}', '{1}')".format(new_values['name'], new_values['password']) else: @@ -50,8 +49,8 @@ def update_user(request, name, new_values): query = "UPDATE users SET %s WHERE name = :name;" % s execute_query(request, query, new_values) -def update_last_connection(request, id): +def update_last_connection(request, id, password_hash): """Update last connection for login """ last_logged = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S') - query = "UPDATE users SET last_logged = '" + last_logged + "' WHERE id=:id;" - execute_query(request, query, {'id': id}) + query = "UPDATE users SET last_logged=:last_logged, password=:password_hash WHERE id=:id;" + execute_query(request, query, {'id': id, 'last_logged': last_logged, 'password_hash': password_hash}) diff --git a/cao_sunyata/templates/blog.jinja2 b/cao_sunyata/templates/blog.jinja2 index 6feb64d..0448619 100644 --- a/cao_sunyata/templates/blog.jinja2 +++ b/cao_sunyata/templates/blog.jinja2 @@ -19,7 +19,7 @@

Auteur : {{ entry.author }}
- Publié le : {{ entry.created.strftime("%d-%m-%Y - %H:%M") }}
+ Publié le : {{ entry.create_date }}
{% if request.authenticated_userid %} Topic - Tag : {{ entry.topic_id }} - {{ entry.tag }}
Statut : {{ entry.status }} diff --git a/cao_sunyata/templates/blog_edit.jinja2 b/cao_sunyata/templates/blog_edit.jinja2 index 16c5367..c9ff9ff 100644 --- a/cao_sunyata/templates/blog_edit.jinja2 +++ b/cao_sunyata/templates/blog_edit.jinja2 @@ -4,46 +4,54 @@

- {% for error in form.title.errors %} -
{{ error }}
- {% endfor %}
- - {{ form.title(class_='form-control') }} -
- - {% for error in form.body.errors %} -
{{ error }}
- {% endfor %} -
- - {{ form.body(class_='form-control monospace-font', cols="35", rows="20") }} + +
- - {{ form.tag(class_='form-control') }} + +
- - {{ form.author(class_='form-control') }} + +
- - {{ form.status(class_='form-control') }} + +
- - {{ form.created(class_='form-control') }} + + +
+ +
+ +

Topic : {{ entry.topic_id }}
{% if blog_id != '0' %} - Modifié le : {{ entry.edited.strftime("%d-%m-%Y - %H:%M") }} + Modifié le : {{ entry.edit_date }} {% endif %}


diff --git a/cao_sunyata/templates/blog_search.jinja2 b/cao_sunyata/templates/blog_search.jinja2 index d237e59..f56ed4f 100644 --- a/cao_sunyata/templates/blog_search.jinja2 +++ b/cao_sunyata/templates/blog_search.jinja2 @@ -7,17 +7,14 @@
- {{ form.criteria(class_='form-control') }} +
- {% for error in form.criteria.errors %} -
{{ error }}
- {% endfor %} -
+
@@ -35,12 +32,12 @@ {% for entry in items %} - + {{ entry.title }} {{ entry.tag }} - {{ entry.edited.strftime("%d-%m-%Y - %H:%M") }} + {{ entry.edit_date }} {% endfor %} diff --git a/cao_sunyata/templates/home.jinja2 b/cao_sunyata/templates/home.jinja2 index cca4c88..873346a 100644 --- a/cao_sunyata/templates/home.jinja2 +++ b/cao_sunyata/templates/home.jinja2 @@ -78,7 +78,7 @@ {{ entry.create_date }} - {{ entry.title }} + {{ entry.title }} {{ entry.author }} {% if entry.status == 'brouillon' %} diff --git a/cao_sunyata/templates/settings.jinja2 b/cao_sunyata/templates/settings.jinja2 index 9ee7879..0be476e 100644 --- a/cao_sunyata/templates/settings.jinja2 +++ b/cao_sunyata/templates/settings.jinja2 @@ -43,7 +43,7 @@ {{ entry.edit_date }} {{ entry.editor }} - {{ entry.title }} + {{ entry.title }} {{ entry.tag }} {% if entry.status == 'brouillon' %} diff --git a/cao_sunyata/templates/tag_edit.jinja2 b/cao_sunyata/templates/tag_edit.jinja2 index 29b2d62..0034226 100644 --- a/cao_sunyata/templates/tag_edit.jinja2 +++ b/cao_sunyata/templates/tag_edit.jinja2 @@ -2,24 +2,16 @@ {% block content %} -
- - {% for error in form.tag.errors %} -
{{ error }}
- {% endfor %} +
- - {{form.tag(class_='form-control')}} + +
- {% for error in form.tag_name.errors %} -
{{error}}
- {% endfor %} -
- - {{form.tag_name(class_='form-control')}} + +
@@ -27,7 +19,7 @@ Retour - {% if form.id.data %} + {% if entry.tag != '0' %} {% endif %} @@ -46,7 +38,7 @@
-

Etes-vous certain(e) de vouloir supprimer le Tag {{ form.tag_name.data }} ?

+

Etes-vous certain(e) de vouloir supprimer le Tag {{ tag_name }} ?

diff --git a/cao_sunyata/templates/topic_edit.jinja2 b/cao_sunyata/templates/topic_edit.jinja2 index 55d5095..6aa6ece 100644 --- a/cao_sunyata/templates/topic_edit.jinja2 +++ b/cao_sunyata/templates/topic_edit.jinja2 @@ -2,32 +2,23 @@ {% block content %} - - - {% for error in form.topic.errors %} -
{{ error }}
- {% endfor %} +
- - {{form.topic(class_='form-control')}} + +
- {% for error in form.topic_name.errors %} -
{{error}}
- {% endfor %} -
- - {{form.topic_name(class_='form-control')}} + +
- {% for error in form.topic_quote.errors %} -
{{ error }}
- {% endfor %}
- - {{ form.topic_quote(class_='form-control monospace-font', cols="35", rows="5") }} + +
@@ -35,17 +26,16 @@ Retour - {% if form.topic.data %} + {% if entry.topic != '0' %} {% endif %}
-

Liste des Tags

-

+

Nouveau

@@ -60,7 +50,7 @@ {{ entry.tag }} - + {{ entry.tag_name }} @@ -78,7 +68,7 @@
-

Etes-vous certain(e) de vouloir supprimer le Topic {{ form.topic_name.data }} ?

+

Etes-vous certain(e) de vouloir supprimer le Topic {{ entry.topic_name }} ?

diff --git a/cao_sunyata/views/blog.py b/cao_sunyata/views/blog.py index 1e83a02..92f2ac6 100644 --- a/cao_sunyata/views/blog.py +++ b/cao_sunyata/views/blog.py @@ -4,7 +4,8 @@ import markdown import datetime #<- will be used to set default dates on models from ..models.entries import * -from ..forms import BlogCreateForm, BlogUpdateForm, BlogSearchForm +from webhelpers2.text import urlify #<- will generate slugs +from webhelpers2.date import distance_of_time_in_words #<- human friendly dates @view_config(route_name='blog', renderer='cao_sunyata:templates/blog.jinja2') @@ -41,16 +42,19 @@ def blog_copy(request): return HTTPFound(location=request.route_url('topic', topic=topic)) # create a new post - dup_entry = BlogRecord() - dup_entry.title = entry.title + ' - copie' - dup_entry.body = entry.body - dup_entry.topic_id = entry.topic_id - dup_entry.tag = entry.tag - dup_entry.author = entry.author - dup_entry.status = 'brouillon' - dup_entry.created = datetime.datetime.now() - dup_entry.edited = datetime.datetime.now() - request.dbsession.add(dup_entry) + new_values = {} + new_values['title'] = entry.title + ' - copie' + new_values['body'] = entry.body + new_values['created'] = datetime.datetime.now() + new_values['edited'] = datetime.datetime.now() + new_values['topic_id'] = topic + new_values['tag'] = entry.tag + new_values['author'] = entry.author + new_values['status'] = 'brouillon' + new_values['creator'] = request.authenticated_userid + new_values['editor'] = '' + update_entry(request, '0', new_values) + return HTTPFound(location=request.route_url('topic', topic=topic)) request.session.flash("La page a été duppliquée avec succès", 'success') return HTTPFound(location=request.route_url('topic', topic=topic)) @@ -68,11 +72,17 @@ def blog_edit(request): if blog_id == '0': # create a new post - entry = BlogRecord() - entry.topic_id = topic - entry.created = datetime.datetime.now() - form = BlogCreateForm(request.POST, entry) - form.tag.choices = [(row.tag, row.tag_name) for row in tags] + entry = {} + entry['title'] = '' + entry['body'] = '' + entry['created'] = datetime.datetime.now() + entry['edited'] = datetime.datetime.now() + entry['topic_id'] = topic + entry['tag'] = '' + entry['author'] = '' + entry['status'] = '' + entry['creator'] = request.authenticated_userid + entry['editor'] = '' page_title = 'Nouvelle page' else: @@ -81,41 +91,37 @@ def blog_edit(request): if not entry: request.session.flash("Page non trouvée : %s" % blog_id, 'warning') return HTTPFound(location=request.route_url('topic', topic=topic)) - form = BlogUpdateForm(request.POST, entry) - form.tag.choices = [(row.tag, row.tag_name) for row in tags] page_title = 'Modifier : ' + entry.title - if 'form.submitted' in request.params and form.validate(): - if blog_id == '0': - form.populate_obj(entry) - entry.topic_id = topic - # interdire le car '/' dans le titre à cause du slug - entry.title = entry.title.replace('/','.') - entry.creator = request.authenticated_userid - entry.editor = entry.creator - request.dbsession.add(entry) - + if 'form.submitted' in request.params: + new_values = {} + for param in entry.keys(): + if param in request.params and request.params[param] != entry[param]: + new_values[param] = request.params[param] + if param == 'title': + # interdire le car '/' dans le titre à cause du slug + new_values['title'] = new_values['title'].replace('/','.') + elif param == 'body': + new_values['body'] = new_values['body'].strip() + + # import pdb;pdb.set_trace() + if new_values: + new_values['topic_id'] = topic + new_values['editor'] = request.authenticated_userid + update_entry(request, blog_id, new_values) return HTTPFound(location=request.route_url('topic', topic=topic)) - else: - del form.id # SECURITY: prevent overwriting of primary key - form.populate_obj(entry) - # interdire le car '/' dans le titre à cause du slug - entry.title = entry.title.replace('/','.') - entry.edited = datetime.datetime.now() - entry.editor = request.authenticated_userid - return HTTPFound(location=request.route_url('blog', id=entry.id, slug=entry.slug)) if 'form.deleted' in request.params: - BlogRecordService.delete(request, blog_id) + delete_entry(request, blog_id) request.session.flash("La page a été supprimée avec succès.", 'success') return HTTPFound(location=request.route_url('topic', topic=topic)) return { 'page_title': page_title, 'url': url, - 'form': form, 'blog_id': blog_id, 'entry': entry, + 'tags': tags, } @@ -127,14 +133,14 @@ def blog_search(request): # generate a list of all tags of all topics if request.authenticated_userid: # get all topics - topics = BlogRecordService.get_topics(request) + topics = get_topics(request) for topic in topics: liste += '

{1}

'.format( request.route_url('topic', topic=topic.topic), topic.topic_name) # get all the tags of the topic - tags = BlogRecordService.get_tags_byTopic(request, topic.topic) + tags = get_tags_byTopic(request, topic.topic) if tags: liste += '
    ' for tag in tags: @@ -143,16 +149,14 @@ def blog_search(request): tag.tag_name, count) liste += '
' - form = BlogSearchForm(request.POST) items = [] - if 'form.submitted' in request.params and form.validate(): + if 'form.submitted' in request.params: criteria = request.params['criteria'] # si afficher tous les fiches ? items = get_entries_by_criteria(request, criteria) return { 'page_title': "Rechercher", - 'form': form, 'items': items, 'criteria': criteria, 'liste': liste, @@ -164,14 +168,14 @@ def topic(request): topic = request.matchdict['topic'] # get the topic record - topic_record = BlogRecordService.get_topic_byTopic(request, topic) + topic_record = get_topic_byTopic(request, topic) # convertir champ topic_quote en HTML topic_quote = markdown.markdown(topic_record.topic_quote) # insèrer le path de static/img topic_quote = topic_quote.replace('static/', "%s/static/" % request.application_url) # get all the tags of this topic - tags = BlogRecordService.get_tags_byTopic(request, topic) + tags = get_tags_byTopic(request, topic) # generate the items list group by tag liste = '' @@ -182,10 +186,11 @@ def topic(request): if items: liste += '
    ' for item in items: + item_slug = urlify(item.title) liste += '' - liste += '' % (request.route_url('blog', id=item.id, slug=item.slug), item.title) + liste += '' % (request.route_url('blog', id=item.id, slug=item_slug), item.title) liste += '' % item.author - liste += '' % item.created.strftime("%d-%m-%Y") + liste += '' % item.create_date if item.status != 'publié': liste += '' % item.status liste += '' diff --git a/cao_sunyata/views/default.py b/cao_sunyata/views/default.py index 2f2d6c1..6bef33a 100644 --- a/cao_sunyata/views/default.py +++ b/cao_sunyata/views/default.py @@ -7,7 +7,6 @@ from pyramid.httpexceptions import HTTPFound from pyramid.security import remember, forget from pyramid_mailer.message import Message, Attachment -from ..forms import UserCreateForm, TopicForm, TagForm from ..models.users import * from ..models.entries import * from datetime import datetime @@ -161,9 +160,15 @@ def login(request): user = get_users_by_name(request, username) # Is user existed ? if user : - if blogger_pwd_context.verify(userpwd, user.password): + # is it cleartext? + if userpwd == user.password: + password_hash = blogger_pwd_context.encrypt(user.password) + else: + password_hash = user.password + + if blogger_pwd_context.verify(userpwd, password_hash): # pwd OK, set last login date - update_last_connection(request, user.id) + update_last_connection(request, user.id, password_hash) # force le commit car il ne se fait pas automatiquement après l'update transaction.commit() headers = remember(request, username) @@ -240,7 +245,6 @@ def user_edit(request): if 'form.deleted' in request.params: - import pdb;pdb.set_trace() delete_user(request, user.id) request.session.flash("La fiche a été supprimée avec succès.", 'success') return HTTPFound(location=url_retour) @@ -264,8 +268,7 @@ def topics(request): 'topics': topics } -@view_config(route_name='topic_edit', - renderer='cao_sunyata:templates/topic_edit.jinja2', permission='view') +@view_config(route_name='topic_edit', renderer='cao_sunyata:templates/topic_edit.jinja2', permission='view') def topic_edit(request): # get topic parameters from request topic = request.matchdict['topic'] @@ -276,44 +279,43 @@ def topic_edit(request): if topic == '0': # create a new topic - entry = Topics() - form = TopicForm(request.POST, entry) - page_title = "Nouveau Topic" - + entry = {} + entry['topic'] = '' + entry['topic_name'] = '' + entry['topic_quote'] = '' + page_title = "Nouveau topic" else: # modify post entry = get_topic_byTopic(request, topic) if not entry: request.session.flash(u"Topic non trouvé : %s" % topic, 'warning') return HTTPFound(location=request.route_url('topics')) - form = TopicForm(request.POST, entry) page_title = entry.topic_name - if 'form.submitted' in request.params and form.validate(): - if topic == '0': - form.populate_obj(entry) - request.dbsession.add(entry) - + if 'form.submitted' in request.params: + new_values = {} + for param in entry.keys(): + if param in request.params and request.params[param] != entry[param]: + new_values[param] = request.params[param] + + if new_values: + update_topic(request, topic, new_values) + request.session.flash(u"La fiche a été mise à jour avec succès.", 'success') return HTTPFound(location=request.route_url('topics')) - else: - del form.topic # SECURITY: prevent overwriting of primary key - form.populate_obj(entry) - return HTTPFound(location=request.route_url('topics')) - + if 'form.deleted' in request.params: - topic_delete(request, entry.topic) + delete_topic(request, entry.topic) request.session.flash("La fiche a été supprimée avec succès.", 'success') return HTTPFound(location=request.route_url('topics')) return { 'page_title': page_title, 'url': url, - 'form': form, + 'entry': entry, 'tags': tags, } -@view_config(route_name='tag_edit', - renderer='cao_sunyata:templates/tag_edit.jinja2', permission='view') +@view_config(route_name='tag_edit', renderer='cao_sunyata:templates/tag_edit.jinja2', permission='view') def tag_edit(request): # get tag parameters from request topic = request.matchdict['topic'] @@ -322,39 +324,41 @@ def tag_edit(request): if tag_id == '0': # create a new tag - entry = Tags() - form = TagForm(request.POST, entry) + entry = {} + entry['topic'] = '' + entry['tag'] = '' + entry['tag_name'] = '' page_title = "Nouveau Tag" - else: # modify post entry = get_tags_byId(request, tag_id) if not entry: request.session.flash(u"Tag non trouvé : %s" % tag_id, 'warning') return HTTPFound(location=request.route_url('topic_edit', topic=topic)) - form = TagForm(request.POST, entry) page_title = entry.tag_name - if 'form.submitted' in request.params and form.validate(): - if tag_id == '0': - form.populate_obj(entry) - entry.topic = topic - request.dbsession.add(entry) - return HTTPFound(location=request.route_url('topic_edit', topic=topic)) - else: - del form.id # SECURITY: prevent overwriting of primary key - form.populate_obj(entry) + if 'form.submitted' in request.params : + new_values = {} + for param in entry.keys(): + if param in request.params and request.params[param] != entry[param]: + new_values[param] = request.params[param] + + # import pdb;pdb.set_trace() + if new_values: + new_values['topic'] = topic + update_tag(request, tag_id, new_values) + request.session.flash(u"La fiche a été mise à jour avec succès.", 'success') return HTTPFound(location=request.route_url('topic_edit', topic=topic)) if 'form.deleted' in request.params: - tag_delete(request, entry.id) + delete_tag(request, tag_id) request.session.flash("La fiche a été supprimée avec succès.", 'success') return HTTPFound(location=request.route_url('topic_edit', topic=topic)) return { 'page_title': page_title, 'url': url, - 'form': form, + 'entry': entry, 'topic': topic, } diff --git a/setup.py b/setup.py index 3c5a855..6f58646 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,6 @@ requires = [ 'SQLAlchemy==1.4.54', 'transaction', 'zope.sqlalchemy==2.0', - 'wtforms', # form library 'webhelpers2', # various web building related helpers 'passlib', 'python-magic',
    %s%s%s%s%s%s