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 @@
| {{ req.user }} |
{{ req.character }} |
{{ req.reason }} |
- {{ req.get_status_description }} |
+ {{ req.get_status_display }} |
{{ req.created_date }} |
Accept
Reject |
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 @@
-- Applying Auth User: {{ app.user }}
-- Applying Character: {{ app.character }}
-- Applying To: {{ app.corporation }}
+- Applying Auth User: {{ app.user.username }}
+- Applying Character: {{ app.character.name }}
+- Applying To: {{ app.corporation.name }}
- Application Status: {{ app.get_status_display }}
{% if hrstaff %}
- Blacklist Status: {% if app.blacklisted %}>BLACKLISTED{% else %}OK{% endif %}
@@ -67,7 +67,7 @@
{% for a in audit %}
- | {{ a.get_event_display }} | {{ a.user }} | {{ a.date|date:"Y/m/d H:i:s" }} | {{ a.text|linebreaks }} |
+ | {{ a.get_event_display }} | {{ a.user.profile.all.0.primary_character }} | {{ a.date|date:"Y/m/d H:i:s" }} | {{ a.text|linebreaks }} |
{% endfor %}
@@ -100,7 +100,7 @@
{% for rec in app.recommendation_set.all %}
| {{ rec.user }} |
- {{ rec.user_character }} |
+ {{ rec.user_character }} |
{{ rec.user_character.corporation }} |
{% if rec.is_valid %}Yes{% else %}No{% endif %} |
{{ rec.user.recommendation_set.all.count }} |
@@ -141,7 +141,7 @@
{% for acc in app.user.eveaccount_set.all %}
{% for char in acc.characters.all %}
- | {{ char.name }} |
+
| {{ char.name }} |
{{ char.corporation }}{% if char.corporation.alliance %} /
{{ char.corporation.alliance }}{% endif %}
|
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 @@
- Username: {{ user.username }}
+- Primary Character: {{ user.profile.all.0.primary_character }}
- Active: {{ user.is_active }}
- Email: {{ user.email }}
- Groups: {{ user.groups.all|join:", " }}
@@ -45,7 +46,7 @@
{% for note in user.notes.all %}
- | {{ note.note|linebreaks }} | {{ note.date_created|date:"Y/m/d H:i:s" }} | {{ note.created_by }} |
+ | {{ note.note|linebreaks }} | {{ note.date_created|date:"Y/m/d H:i:s" }} | {{ note.created_by.profile.all.0.primary_character }} |
{% endfor %}
@@ -95,7 +96,7 @@
{% for rec in user.recommendation_set.all %}
| {{ rec.application.character.name }} |
- {{ rec.user_character }} |
+ {{ rec.user_character }} |
{{ rec.recommendation_date }} |
{% endfor %}
@@ -138,9 +139,9 @@
{% if acc.characters.count %}
| Account {{ acc.api_user_id }} |
{% for char in acc.characters.all %}
- | {{ char.name }} |
- {{ char.corporation }} |
- {% if char.corporation.alliance %}{{ char.corporation.alliance }}{% endif %} |
+
| {{ char.name }} |
+ {{ char.corporation }} |
+ {% if char.corporation.alliance %}{{ char.corporation.alliance }}{% endif %} |
{{ char.balance|intcomma }} ISK |
{{ char.total_sp|intcomma }} SP |
{% if char.current_training %}{{ char.current_training.skill.name }} to Level {{ char.current_training.in_training }}{% endif %} |