DRY sur les commentaires des apercus

diff --git a/project/rh/templates/rh/include/commentaires.html b/project/rh/templates/rh/include/commentaires.html
new file mode 100644 (file)
index 0000000..62ca5d0
--- /dev/null
+++ b/project/rh/templates/rh/include/commentaires.html
@@ -0,0 +1,20 @@
+{% if commentaires|length > 0  %}
+<h3>Commentaires</h3>
+<table>
+  <thead>
+    <tr>
+      <th>Commentaire</th>
+      <th>Auteur</th>
+    </tr>
+  </thead>
+  <tbody>
+    {% for c in commentaires %}
+    <tr>
+      <td>{{ c.texte }}</td>
+      <td>{{ c.owner }}</td>
+    </tr>
+    {% endfor %}
+  </tbody>
+</table>
+{% endif %}
+

diff --git a/project/rh/templates/rh/include/dossier.html b/project/rh/templates/rh/include/dossier.html
index 8b5ff5e..dcae524 100644 (file)
--- a/project/rh/templates/rh/include/dossier.html
+++ b/project/rh/templates/rh/include/dossier.html
@@ -68,3 +68,5 @@
   </tr>
   {% endfor %}
 </table>
+
+{% include "rh/include/commentaires.html" %}

diff --git a/project/rh/templates/rh/include/poste.html b/project/rh/templates/rh/include/poste.html
index 0b0e5dc..81ee60a 100644 (file)
--- a/project/rh/templates/rh/include/poste.html
+++ b/project/rh/templates/rh/include/poste.html
@@ -213,23 +213,4 @@
 </table>
 {% endif %}
 
-{% if commentaires|length > 0  %}
-<h3>Commentaires</h3>
-<table>
-  <thead>
-    <tr>
-      <th>Commentaire</th>
-      <th>Auteur</th>
-    </tr>
-  </thead>
-  <tbody>
-    {% for c in commentaires %}
-    <tr>
-      <td>{{ c.texte }}</td>
-      <td>{{ c.owner }}</td>
-    </tr>
-    {% endfor %}
-  </tbody>
-</table>
-{% endif %}
-
+{% include "rh/include/commentaires.html" %}

diff --git a/project/rh/views.py b/project/rh/views.py
index 9b9d7bc..6b56462 100644 (file)
--- a/project/rh/views.py
+++ b/project/rh/views.py
@@ -302,6 +302,7 @@ def dossier_apercu(request, dossier_id):
         'dossier' : d,
         'pieces' :  rh.DossierPiece.objects.filter(dossier__exact=d),
         'contrats' : rh.Contrat.objects.filter(dossier__exact=d),
+        'commentaires' : rh.DossierCommentaire.objects.filter(dossier__exact=d).all(),
         'media' : settings.PRIVE_MEDIA_URL
     }
     return render_to_response('admin/rh/dossier/apercu.html', c, RequestContext(request))