enhanced docs_tags display

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):
+def get_d_tags_manquant(request, topic, doc_id):
-    query = "SELECT * FROM d_tags WHERE topic=:topic;"
+    # tags à ajouter
-    results = request.dbsession.execute(query,  {'topic': topic}).fetchall()
+    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):

caotek_mesavoirs/templates/contents/doc_edit.pt

@@ -53,8 +53,8 @@
 					</div>
 				</div>
 				<br />
-				<h3>Tags</h3>
 				<div class="col-xs-6">
+					<h3>Tags</h3>
 					<table class="table table-condensed">
 						<tbody>
 							<tr tal:repeat="ligne tags">
@@ -65,6 +65,7 @@
 					</table>
 				</div>
 				<div class="col-xs-6">
+					<h3>Tags à ajouter</h3>
 					<table class="table table-condensed">
 						<tbody>
 							<tr tal:repeat="ligne d_tags">

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 = {}