# HG changeset patch # User Lennard de Rijk # Date 1239053890 0 # Node ID c9792aca29f6bcf2e3ab664bd5564801785e8384 # Parent 6557b0b1305f5dd66c774b02299d961d4b17d4cc Added Mentor name column to StudentProposals list. Patch by: Lennard de Rijk Reviewed by: to-be-reviewed diff -r 6557b0b1305f -r c9792aca29f6 app/soc/templates/soc/student_proposal/list/detailed_heading.html --- a/app/soc/templates/soc/student_proposal/list/detailed_heading.html Mon Apr 06 21:19:58 2009 +0000 +++ b/app/soc/templates/soc/student_proposal/list/detailed_heading.html Mon Apr 06 21:38:10 2009 +0000 @@ -2,7 +2,7 @@ Rank Title Student - Status + Mentor Score Last Modified on diff -r 6557b0b1305f -r c9792aca29f6 app/soc/templates/soc/student_proposal/list/detailed_row.html --- a/app/soc/templates/soc/student_proposal/list/detailed_row.html Mon Apr 06 21:19:58 2009 +0000 +++ b/app/soc/templates/soc/student_proposal/list/detailed_row.html Mon Apr 06 21:38:10 2009 +0000 @@ -10,7 +10,13 @@
{{ list.item.scope.name }}
-
{{ list.item.status }}
+
+ {% if not list.item.mentor %} + None + {% else %} + {{ list.item.mentor.name }} + {% endif %} +
{{ list.item.score }}
{{ list.item.last_modified_on|date:"jS F Y H:i" }}
diff -r 6557b0b1305f -r c9792aca29f6 app/soc/templates/soc/student_proposal/list/heading.html --- a/app/soc/templates/soc/student_proposal/list/heading.html Mon Apr 06 21:19:58 2009 +0000 +++ b/app/soc/templates/soc/student_proposal/list/heading.html Mon Apr 06 21:38:10 2009 +0000 @@ -1,6 +1,7 @@ Title Student + Mentor Organization Name Last Modified on diff -r 6557b0b1305f -r c9792aca29f6 app/soc/templates/soc/student_proposal/list/row.html --- a/app/soc/templates/soc/student_proposal/list/row.html Mon Apr 06 21:19:58 2009 +0000 +++ b/app/soc/templates/soc/student_proposal/list/row.html Mon Apr 06 21:38:10 2009 +0000 @@ -5,6 +5,13 @@
{{ list.item.scope.name }}
+
+ {% if not list.item.mentor %} + None + {% else %} + {{ list.item.mentor.name }} + {% endif %} +
{{ list.item.org.name }}
{{ list.item.last_modified_on|date:"jS F Y H:i" }}