diff --git a/bd_mesavoirs.mwb b/bd_mesavoirs.mwb index 0103130..581de95 100644 Binary files a/bd_mesavoirs.mwb and b/bd_mesavoirs.mwb differ diff --git a/bd_mesavoirs.mwb.bak b/bd_mesavoirs.mwb.bak index 9369c5b..0103130 100644 Binary files a/bd_mesavoirs.mwb.bak and b/bd_mesavoirs.mwb.bak differ diff --git a/caotek_mesavoirs/models/contents.py b/caotek_mesavoirs/models/contents.py index 1d7c7c7..9b943cc 100644 --- a/caotek_mesavoirs/models/contents.py +++ b/caotek_mesavoirs/models/contents.py @@ -44,9 +44,12 @@ def get_docs_tags(request, doc_id): results = request.dbsession.execute(query, {'doc_id': doc_id}).fetchall() return results -def get_d_tags(request, topic): - query = "SELECT * FROM d_tags WHERE topic=:topic;" - results = request.dbsession.execute(query, {'topic': topic}).fetchall() +def get_d_tags_manquant(request, topic, doc_id): + # tags à ajouter + query = """SELECT d_tags.* FROM d_tags +LEFT JOIN docs_tags ON docs_tags.tag = d_tags.tag AND docs_tags.doc_id = :doc_id +WHERE d_tags.topic=:topic AND docs_tags.tag IS null;""" + results = request.dbsession.execute(query, {'topic': topic, 'doc_id': doc_id}).fetchall() return results def get_d_topics(request, logged_in): diff --git a/caotek_mesavoirs/templates/contents/doc_edit.pt b/caotek_mesavoirs/templates/contents/doc_edit.pt index c932a3c..45e1ee8 100644 --- a/caotek_mesavoirs/templates/contents/doc_edit.pt +++ b/caotek_mesavoirs/templates/contents/doc_edit.pt @@ -53,8 +53,8 @@
-

Tags

+

Tags

@@ -65,6 +65,7 @@
+

Tags à ajouter

diff --git a/caotek_mesavoirs/views/contents.py b/caotek_mesavoirs/views/contents.py index 2d18829..69057ec 100644 --- a/caotek_mesavoirs/views/contents.py +++ b/caotek_mesavoirs/views/contents.py @@ -62,7 +62,7 @@ def doc_edit(request): doc = get_docs(request, doc_id) tags = get_docs_tags(request, doc.doc_id) - d_tags = get_d_tags(request, topic) + d_tags = get_d_tags_manquant(request, topic, doc_id) if 'form.submitted' in request.params: new_values = {}