whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Sam Ruby <ru...@apache.org>
Subject [whimsy.git] [1/1] Commit b03e66c: preload more attrs, and don't die if person is not in LDAP
Date Thu, 10 Mar 2016 01:10:29 GMT
Commit b03e66cc6c71feb43a0b3597d3fabf3c74fcf102:
    preload more attrs, and don't die if person is not in LDAP


Branch: refs/heads/reuse-auth-parser
Author: Sam Ruby <rubys@intertwingly.net>
Committer: Sam Ruby <rubys@intertwingly.net>
Pusher: rubys <rubys@apache.org>

------------------------------------------------------------
www/secretary/public-names.cgi                               | ++ --
------------------------------------------------------------
4 changes: 2 additions, 2 deletions.
------------------------------------------------------------


diff --git a/www/secretary/public-names.cgi b/www/secretary/public-names.cgi
index 5c1c51d..7034394 100755
--- a/www/secretary/public-names.cgi
+++ b/www/secretary/public-names.cgi
@@ -33,7 +33,7 @@ _html do
   _h1 "public names: LDAP vs ICLA.txt"
 
   # prefetch LDAP data
-  ASF::Person.preload('cn')
+  people = ASF::Person.preload(%w(cn dn))
 
   if @updates
 
@@ -155,7 +155,7 @@ _html do
     ASF::ICLA.each do |icla|
       next if icla.id == 'notinavail'
       person = ASF::Person.find(icla.id)
-      next unless person.dn
+      next unless person.dn and person.attrs['cn']
 
       if person.cn != icla.name
         # locate point at which names differ

Mime
View raw message