From fb167c8b7b568b7daf150996bc11bb652302761c Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Fri, 8 Jun 2012 19:28:00 +0100
Subject: [PATCH] Fix some minor display and linking issues

---
 app/groups/templates/groups/group_admin.html |  2 +-
 app/hr/templates/hr/applications/view.html   | 12 ++++++------
 app/sso/templates/sso/lookup/user.html       | 11 ++++++-----
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/groups/templates/groups/group_admin.html b/app/groups/templates/groups/group_admin.html
index c456aa5..1d705f5 100644
--- a/app/groups/templates/groups/group_admin.html
+++ b/app/groups/templates/groups/group_admin.html
@@ -40,7 +40,7 @@
     <tr><td><a href="{% url sso.views.user_view req.user.username %}">{{ req.user }}</a></td>
       <td>{{ req.character }}</td>
       <td>{{ req.reason }}</td>
-      <td>{{ req.get_status_description }}</td>
+      <td>{{ req.get_status_display }}</td>
       <td>{{ req.created_date }}</td>
       <td><a href="{% url groups.views.accept_request req.id %}">Accept</a>&nbsp;
           <a href="{% url groups.views.reject_request req.id %}">Reject</a></td>
diff --git a/app/hr/templates/hr/applications/view.html b/app/hr/templates/hr/applications/view.html
index e6247e2..978f073 100644
--- a/app/hr/templates/hr/applications/view.html
+++ b/app/hr/templates/hr/applications/view.html
@@ -14,9 +14,9 @@
 </div>
 
 <ul>
-<li>Applying Auth User: <a href="{% url sso.views.user_view app.user %}">{{ app.user }}</a></li>
-<li>Applying Character: <a href="{% url eve_api.views.eveapi_character app.character.id %}">{{ app.character }}</a></li>
-<li>Applying To: <a href="{% url eveapi-corporation app.corporation.id %}">{{ app.corporation }}</a></li>
+<li>Applying Auth User: <a href="{% url sso.views.user_view app.user %}">{{ app.user.username }}</a></li>
+<li>Applying Character: <a href="{% url eveapi-character app.character.pk %}">{{ app.character.name }}</a></li>
+<li>Applying To: <a href="{% url eveapi-corporation app.corporation.pk %}">{{ app.corporation.name }}</a></li>
 <li>Application Status: {{ app.get_status_display }}</li>
 {% if hrstaff %}
 <li>Blacklist Status: <b>{% if app.blacklisted %}<span class="label important">>BLACKLISTED</span>{% else %}<span class="label success">OK</span>{% endif %}</b></li>
@@ -67,7 +67,7 @@
   </thead>
   <tbody>
     {% for a in audit %}
-    <tr><td>{{ a.get_event_display }}</td><td>{{ a.user }}</td><td>{{ a.date|date:"Y/m/d H:i:s" }}</td><td>{{ a.text|linebreaks }}</td></tr>
+    <tr><td>{{ a.get_event_display }}</td><td><a href="{% url sso-viewuser a.user.username %}">{{ a.user.profile.all.0.primary_character }}</a></td><td>{{ a.date|date:"Y/m/d H:i:s" }}</td><td>{{ a.text|linebreaks }}</td></tr>
     {% endfor %}
   </tbody>
 </table>
@@ -100,7 +100,7 @@
   <tbody>
     {% for rec in app.recommendation_set.all %}
     <tr><td><a href="{% url sso.views.user_view rec.user %}">{{ rec.user }}</a></td>
-      <td><a href="{% url eve_api.views.eveapi_character rec.user_character.id %}">{{ rec.user_character }}</a></td>
+      <td><a href="{% url eveapi-character rec.user_character.pk %}">{{ rec.user_character }}</a></td>
       <td><a href="http://evemaps.dotlan.net/corp/{{ rec.user_character.corporation.name }}">{{ rec.user_character.corporation }}</a></td>
       <td>{% if rec.is_valid %}<font color="green">Yes</font>{% else %}<font color="red">No</font>{% endif %}</td>
       <td>{{ rec.user.recommendation_set.all.count }}</td>
@@ -141,7 +141,7 @@
   <tbody>
     {% for acc in app.user.eveaccount_set.all %}
     {% for char in acc.characters.all %}
-    <tr{% if char.id == app.character.id %} style="background-color: #FFE8D0"{% endif%}><td><a href="{% url eve_api.views.eveapi_character char.id %}">{{ char.name }}</a></td>
+    <tr{% if char.id == app.character.id %} style="background-color: #FFE8D0"{% endif%}><td><a href="{% url eveapi-character char.pk %}">{{ char.name }}</a></td>
       <td><a href="http://evemaps.dotlan.net/corp/{{ char.corporation }}">{{ char.corporation }}</a>{% if char.corporation.alliance %} / 
         <a href="http://evemaps.dotlan.net/alliance/{{ char.corporation.alliance }}">{{ char.corporation.alliance }}</a>{% endif %}
       </td>
diff --git a/app/sso/templates/sso/lookup/user.html b/app/sso/templates/sso/lookup/user.html
index 6bb66fe..2153751 100644
--- a/app/sso/templates/sso/lookup/user.html
+++ b/app/sso/templates/sso/lookup/user.html
@@ -13,6 +13,7 @@
 
 <p>
 <li><b>Username:</b> {{ user.username }}</li>
+<li><b>Primary Character:</b> <a href="{% url eveapi-character user.profile.all.0.primary_character.pk %}">{{ user.profile.all.0.primary_character }}</a></li>
 <li><b>Active:</b> {{ user.is_active }}</li>
 <li><b>Email:</b> {{ user.email }}</li>
 <li><b>Groups:</b> {{ user.groups.all|join:", " }}</li>
@@ -45,7 +46,7 @@
   </thead>
   <tbody>
     {% for note in user.notes.all %}
-    <tr><td>{{ note.note|linebreaks }}</td><td>{{ note.date_created|date:"Y/m/d H:i:s" }}</td><td><a href="{% url sso-viewuser note.created_by %}">{{ note.created_by }}</a></td></tr>
+    <tr><td>{{ note.note|linebreaks }}</td><td>{{ note.date_created|date:"Y/m/d H:i:s" }}</td><td><a href="{% url sso-viewuser note.created_by %}">{{ note.created_by.profile.all.0.primary_character }}</a></td></tr>
     {% endfor %}
   </tbody>
 </table>
@@ -95,7 +96,7 @@
     <tbody>
       {% for rec in user.recommendation_set.all %}
       <tr><td><a href="{% url hr-viewapplication rec.application.id %}">{{ rec.application.character.name }}</a></td>
-        <td>{{ rec.user_character }}</td>
+        <td><a href="{% url eveapi-character rec.user_character.pk %}">{{ rec.user_character }}</a></td>
         <td>{{ rec.recommendation_date }}</td></tr>
       {% endfor %}
     </tbody>
@@ -138,9 +139,9 @@
     {% if acc.characters.count %}
     <tr><th colspan="6">Account {{ acc.api_user_id }}</th></tr>
     {% for char in acc.characters.all %}
-    <tr><td><a href="{% url eve_api.views.eveapi_character char.id %}">{{ char.name }}</a></td>
-      <td><a href="{% url eveapi-corporation char.corporation.id %}">{{ char.corporation }}</a></td>
-      <td>{% if char.corporation.alliance %}<a href="{% url eveapi-alliance char.corporation.alliance.id %}">{{ char.corporation.alliance }}</a>{% endif %}</td>
+    <tr><td><a href="{% url eveapi-character char.pk %}">{{ char.name }}</a></td>
+      <td><a href="{% url eveapi-corporation char.corporation.pk %}">{{ char.corporation }}</a></td>
+      <td>{% if char.corporation.alliance %}<a href="{% url eveapi-alliance char.corporation.alliance.pk %}">{{ char.corporation.alliance }}</a>{% endif %}</td>
       <td style="text-align: right;">{{ char.balance|intcomma }} ISK</td>
       <td style="text-align: right;">{{ char.total_sp|intcomma }} SP</td>
       <td>{% if char.current_training %}{{ char.current_training.skill.name }} to Level {{ char.current_training.in_training }}{% endif %}</td>