Turn the logic around warnings for missing SSH keys around, so we don't

show the warning to users that aren't logged in.

diff --git a/gitadmin/adm/templates/base.html b/gitadmin/adm/templates/base.html
index 95e779a072787e13bd4fd18af0ea73cff81d7b39..b668b4ce63f748e865b6a98ec3d79c6bb5e2303a 100644 (file)
--- a/gitadmin/adm/templates/base.html
+++ b/gitadmin/adm/templates/base.html
@@ -21,7 +21,7 @@
 {%if user.is_superuser %}
 <h2>You are registered as an administrator. BE CAREFUL!</h2>
 {% endif %}
-{%if not has_sshkey %}
+{%if missing_sshkey %}
 <p><b>Note!</b> Your ssh key has not yet been registered with the system, or it has not yet replicated
 from the main server. Please upload your keys using the
 <a href="http://wwwmaster.postgresql.org/community/profile">community account system</a>.</p>

diff --git a/gitadmin/adm/views.py b/gitadmin/adm/views.py
index f4c3684ccc54eb48ec8af91c587d7413083bfcee..effc67cdae6ec76a4858d6bf4706a890bcfbab5d 100644 (file)
--- a/gitadmin/adm/views.py
+++ b/gitadmin/adm/views.py
@@ -12,19 +12,22 @@ from gitadmin.adm.forms import *
 
 # Utility functions
 
-def _HasSshkey(userid):
+def _MissingSshkey(user):
+       if not user.is_authenticated():
+               print "Not auth"
+               return False
        try:
-               gu = GitUser.objects.get(userid=userid)
+               gu = GitUser.objects.get(userid=user.username)
                if gu.sshkey != '':
-                       return True
-               else:
                        return False
+               else:
+                       return True
        except:
-               return False
+               return True
 
 def context_add(request):
                return {
-                       'has_sshkey': _HasSshkey(request.user.username),
+                       'missing_sshkey': _MissingSshkey(request.user),
                }
 
 # Views