You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by Sam Ruby <ru...@apache.org> on 2016/03/10 02:10:29 UTC
[whimsy.git] [1/1] Commit b03e66c: preload more attrs, and don't die if person is not in LDAP
Commit b03e66cc6c71feb43a0b3597d3fabf3c74fcf102:
preload more attrs, and don't die if person is not in LDAP
Branch: refs/heads/reuse-auth-parser
Author: Sam Ruby <ru...@intertwingly.net>
Committer: Sam Ruby <ru...@intertwingly.net>
Pusher: rubys <ru...@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