From 98b93b7b2dde0810b0e0a37af599ba9e536d9719 Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Sun, 29 May 2011 13:57:49 +0100
Subject: [PATCH] Updated templates from Live

---
 app/hr/templates/hr/applications/view.html |  2 +-
 app/sso/templates/sso/lookup/user.html     |  2 --
 app/sso/templates/sso/profile.html         | 12 ++++++------
 app/templates/base.html                    |  4 +++-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/hr/templates/hr/applications/view.html b/app/hr/templates/hr/applications/view.html
index 5a8a62a..6089922 100644
--- a/app/hr/templates/hr/applications/view.html
+++ b/app/hr/templates/hr/applications/view.html
@@ -98,7 +98,7 @@
 <h3>API Keys</h3>
 <table>
 <tr><th>User ID</th><th>API Key</th><th>Description</th><th>Type</th><th>Active</th><th>Last Updated</th></tr>
-{% for acc in user.eveaccount_set.all %}
+{% for acc in app.user.eveaccount_set.all %}
 <tr><td>{{ acc.api_user_id }}</td>
     <td>{{ acc.api_key }}</td>
     <td>{{ acc.description }}</td>
diff --git a/app/sso/templates/sso/lookup/user.html b/app/sso/templates/sso/lookup/user.html
index 55573d1..4c3361a 100644
--- a/app/sso/templates/sso/lookup/user.html
+++ b/app/sso/templates/sso/lookup/user.html
@@ -28,7 +28,6 @@
 </div>
 </p>
 
-{% if is_admin %}
 <br/>
 {% if services %}
 <h2>Service Accounts</h2>
@@ -127,6 +126,5 @@
 </table>
 {% endif %}
 {% endif %}
-{% endif %}
 
 {% endblock %}
diff --git a/app/sso/templates/sso/profile.html b/app/sso/templates/sso/profile.html
index a739ac3..e9a1d36 100644
--- a/app/sso/templates/sso/profile.html
+++ b/app/sso/templates/sso/profile.html
@@ -14,23 +14,23 @@ function refresh_apikey(key) {
     $("#api-status-" + key).html("<center><img src='{{ STATIC_URL }}img/spinner.gif'/></center>");
     $("#api-time-" + key).html("<center><img src='{{ STATIC_URL }}img/spinner.gif'/></center>");  
     $.getJSON("/eve/eveapi/refresh/" + key + "/", function(json) {
-            $("#api-time-" + json[0].fields.api_user_id).html("a moment ago");
+            $("#api-time-" + json[0].pk).html("a moment ago");
 
             switch(json[0].fields.api_status) {
                 case 0:
-                    $("#api-status-" + json[0].fields.api_user_id).html("Unknown");
+                    $("#api-status-" + json[0].pk).html("Unknown");
                     break;
                 case 1:
-                    $("#api-status-" + json[0].fields.api_user_id).html("OK");
+                    $("#api-status-" + json[0].pk).html("OK");
                     break;
                 case 2:
-                    $("#api-status-" + json[0].fields.api_user_id).html("Other Error");
+                    $("#api-status-" + json[0].pk).html("Other Error");
                     break;
                 case 3:
-                    $("#api-status-" + json[0].fields.api_user_id).html("Account Expired");
+                    $("#api-status-" + json[0].pk).html("Account Expired");
                     break;
                 default:
-                    $("#api-status-" + json[0].fields.api_user_id).html("Error");
+                    $("#api-status-" + json[0].pk).html("Error");
                     break;
             }
     });
diff --git a/app/templates/base.html b/app/templates/base.html
index f8f3b64..2bfd197 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -23,8 +23,10 @@
                     <li><a href="{% url hr.views.index %}">HR</a></li>
                 {% endif %}
                     <li><a href="{% url eve_api.views.eveapi_character %}">Characters</a></li>
-                {% if request.user.is_staff %}
+                {% if perms.sso.can_search_users %}
                     <li><a href="{% url sso.views.user_lookup %}">Lookup User</a></li>
+                {% endif %}
+                {% if request.user.is_staff %}
                     <li><a href="/admin/">Admin</a></li>
                 {% endif %}
                     <li><a href="{% url django.contrib.auth.views.logout %}">Logout</a></li>